merge witih upsteam c283797207

This commit is contained in:
sevichecc 2022-12-15 23:23:21 +08:00
parent 33938da75c
commit 33eb87f572
Signed by untrusted user who does not match committer: SevicheCC
GPG key ID: C577000000000000
5 changed files with 22 additions and 13 deletions

View file

@ -49,7 +49,7 @@
"chokidar": "^3.5.3", "chokidar": "^3.5.3",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"cssnano": "^5.1.14", "cssnano": "^5.1.14",
"daisyui": "^2.43.2", "daisyui": "^2.45.0",
"eslint": "^8.29.0", "eslint": "^8.29.0",
"eslint-config-prettier": "^8.5.0", "eslint-config-prettier": "^8.5.0",
"eslint-plugin-svelte3": "^4.0.0", "eslint-plugin-svelte3": "^4.0.0",

View file

@ -25,7 +25,7 @@ specifiers:
chokidar: ^3.5.3 chokidar: ^3.5.3
cross-env: ^7.0.3 cross-env: ^7.0.3
cssnano: ^5.1.14 cssnano: ^5.1.14
daisyui: ^2.43.2 daisyui: ^2.45.0
eslint: ^8.29.0 eslint: ^8.29.0
eslint-config-prettier: ^8.5.0 eslint-config-prettier: ^8.5.0
eslint-plugin-svelte3: ^4.0.0 eslint-plugin-svelte3: ^4.0.0
@ -90,7 +90,7 @@ devDependencies:
chokidar: 3.5.3 chokidar: 3.5.3
cross-env: 7.0.3 cross-env: 7.0.3
cssnano: 5.1.14_postcss@8.4.20 cssnano: 5.1.14_postcss@8.4.20
daisyui: 2.43.2_r4gnkvssmvyxmi2wmat5xbx36a daisyui: 2.45.0_r4gnkvssmvyxmi2wmat5xbx36a
eslint: 8.29.0 eslint: 8.29.0
eslint-config-prettier: 8.5.0_eslint@8.29.0 eslint-config-prettier: 8.5.0_eslint@8.29.0
eslint-plugin-svelte3: 4.0.0_ffnabc34fed75fjymbd45uofx4 eslint-plugin-svelte3: 4.0.0_ffnabc34fed75fjymbd45uofx4
@ -5020,8 +5020,8 @@ packages:
resolution: {integrity: sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A==} resolution: {integrity: sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A==}
dev: false dev: false
/daisyui/2.43.2_r4gnkvssmvyxmi2wmat5xbx36a: /daisyui/2.45.0_r4gnkvssmvyxmi2wmat5xbx36a:
resolution: {integrity: sha512-GLOCqzv5YUtnVhVz6HrcoZUULFk7UL/Eyr2732UG1Q2e5rz77lOzSlGKpZyzi1vrdsPgagn29vxLgx/MvaQiIA==} resolution: {integrity: sha512-hAWs7vQLxsWXCd3KMLAMBrZPO6OdU0gIDfOKGmZlyM0ro/pW3J2eGEaBs90Dy8w8L6wD/w1s8Ujd7zG8TYtD3g==}
peerDependencies: peerDependencies:
autoprefixer: ^10.0.2 autoprefixer: ^10.0.2
postcss: ^8.1.6 postcss: ^8.1.6

View file

@ -1,15 +1,22 @@
<script lang="ts"> <script lang="ts">
import { site } from '$lib/config/site' import { site } from '$lib/config/site'
import { src, width, height } from '/static/assets/any@512.png?width=384&metadata'
import srcset from '/static/assets/any@512.png?w=48;96;192&srcset'
</script> </script>
<div <div
class="h-card flex flex-col gap-4 sticky top-24 card card-body p-4 items-right xl:border-2 xl:py-8 border-base-content/10 xl:ml-auto xl:mr-8 xl:max-w-xs"> class="h-card flex flex-col gap-4 sticky top-24 card card-body p-4 items-right xl:border-2 xl:py-8 border-base-content/10 xl:ml-auto xl:mr-8 xl:max-w-xs">
<a href={site.protocol + site.domain} class="hidden u-url u-uid">{site.author.name}</a> <a href={site.protocol + site.domain} class="hidden u-url u-uid">{site.author.name}</a>
<figure class="relative mx-auto group"> <figure class="relative mx-auto group">
<img <picture>
class="rounded-full shadow-xl w-32 h-32 hover:rotate-[360deg] transition-transform duration-1000 ease-in-out" <source {srcset} type="image/avif" />
src={site.author.avatar} <img
alt={site.author.name} /> class="u-photo rounded-full shadow-xl transition-shadow z-10 w-24 h-24 md:w-32 md:h-32 hover:rotate-[360deg] transition-transform duration-1000 ease-in-out"
{src}
{width}
{height}
alt={site.author.name} />
</picture>
{#if site.author.status} {#if site.author.status}
<div class="heart absolute rounded-full w-10 h-10 bottom-0 right-0 bg-base-100 shadow-xl text-xl text-center py-1.5"> <div class="heart absolute rounded-full w-10 h-10 bottom-0 right-0 bg-base-100 shadow-xl text-xl text-center py-1.5">
{site.author.status} {site.author.status}

View file

@ -9,7 +9,6 @@ export const site: SiteConfig = {
description: 'Tech / Code / Random Life', description: 'Tech / Code / Random Life',
author: { author: {
name: '酸橘汁腌鱼', name: '酸橘汁腌鱼',
avatar: '/assets/avatar.jpg',
status: '🖤', status: '🖤',
bio: ' Code / Tech <br> Living a Random Life ', bio: ' Code / Tech <br> Living a Random Life ',
metadata: [ metadata: [

View file

@ -1,8 +1,6 @@
import type { FFFAuthor } from 'fff-flavored-frontmatter' import type { FFFAuthor } from 'fff-flavored-frontmatter'
export type SiteConfig = { export type SiteConfig = {
/** @deprecated - use `description` instead */
descr?: string
/** site protocol. for example: `https://` */ /** site protocol. for example: `https://` */
protocol: string protocol: string
/** site domain. for example: `example.com` */ /** site domain. for example: `example.com` */
@ -17,7 +15,12 @@ export type SiteConfig = {
description?: string description?: string
/** site keywords. `<meta name="keywords" content={site.keywords}>` */ /** site keywords. `<meta name="keywords" content={site.keywords}>` */
keywords?: string[] keywords?: string[]
author: Omit<FFFAuthor, 'url'> & { author: Omit<FFFAuthor, 'url' | 'avatar'> & {
/**
* @deprecated
* @see `$lib/components/index_profile.svelte`
*/
avatar?: never
status?: string status?: string
bio?: string bio?: string
metadata?: ( metadata?: (