diff --git a/apps/stage-web/src/layouts/stage.vue b/apps/stage-web/src/layouts/stage.vue index b211d2267..cd46f3ce6 100644 --- a/apps/stage-web/src/layouts/stage.vue +++ b/apps/stage-web/src/layouts/stage.vue @@ -3,7 +3,7 @@ import { RouterView } from 'vue-router' diff --git a/apps/stage-web/uno.config.ts b/apps/stage-web/uno.config.ts index 3792030cb..693fbd0ef 100644 --- a/apps/stage-web/uno.config.ts +++ b/apps/stage-web/uno.config.ts @@ -22,12 +22,5 @@ export default mergeConfigs([ 'transition-duration': '0s', }], ], - theme: { - fontFamily: { - 'sans': `"DM Sans Variant", "DM Sans", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";`, - 'sans-rounded': `"Comfortaa Variable", "Comfortaa", "DM Sans", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";`, - 'cute': `"Sniglet", "Kiwi Maru", "xiaolai", "DM Sans Variant", "DM Sans", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";`, - }, - }, }, ]) diff --git a/packages/unocss-preset-fonts/src/index.ts b/packages/unocss-preset-fonts/src/index.ts index 3c7d01c77..4d5106f08 100644 --- a/packages/unocss-preset-fonts/src/index.ts +++ b/packages/unocss-preset-fonts/src/index.ts @@ -3,7 +3,7 @@ import { presetWebFonts } from '@unocss/preset-web-fonts' export default definePreset(() => { return { - name: 'preset-chromatic', + name: 'preset-fonts', presets: [ presetWebFonts({ fonts: { diff --git a/uno.config.ts b/uno.config.ts index 2282ead38..e2361786a 100644 --- a/uno.config.ts +++ b/uno.config.ts @@ -190,6 +190,13 @@ export function sharedUnoConfig() { }], ], theme: { + fontFamily: { + 'sans': `"DM Sans Variant", "DM Sans", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";`, + 'sans-rounded': `"Comfortaa Variable", "Comfortaa", "DM Sans", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";`, + 'cute': `"Sniglet", "Kiwi Maru", "xiaolai", "DM Sans Variant", "DM Sans", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";`, + 'cuteen': `"Sniglet", "Kiwi Maru", "xiaolai", "DM Sans Variant", "DM Sans", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";`, + 'cutejp': `"Sniglet", "Kiwi Maru", "xiaolai", "DM Sans Variant", "DM Sans", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";`, + }, /** * https://github.com/unocss/unocss/blob/1031312057a3bea1082b7d938eb2ad640f57613a/packages-presets/preset-wind4/src/theme/animate.ts * https://unocss.dev/presets/wind4#transformdirectives