From 8492d660c70b2989710a49d54933bb9275abf813 Mon Sep 17 00:00:00 2001 From: Neko Ayaka Date: Fri, 20 Dec 2024 15:00:24 +0800 Subject: [PATCH] fix: font --- packages/stage/uno.config.ts | 11 ++++++++++- packages/whisper-webgpu/uno.config.ts | 18 +++++++++++++++++- uno.config.ts | 10 ---------- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/packages/stage/uno.config.ts b/packages/stage/uno.config.ts index 651ab2e39..6a346152a 100644 --- a/packages/stage/uno.config.ts +++ b/packages/stage/uno.config.ts @@ -1,4 +1,4 @@ -import { defineConfig, mergeConfigs } from 'unocss' +import { defineConfig, mergeConfigs, presetWebFonts } from 'unocss' import presetTheme from 'unocss-preset-theme' import UnoCSSConfig from '../../uno.config' @@ -44,6 +44,15 @@ export default defineConfig(mergeConfigs([ }, }, }), + presetWebFonts({ + fonts: { + 'sans': 'DM Sans', + 'serif': 'DM Serif Display', + 'mono': 'DM Mono', + 'cute': 'Kiwi Maru', + 'cute-en': 'Sniglet', + }, + }), ], }, ])) diff --git a/packages/whisper-webgpu/uno.config.ts b/packages/whisper-webgpu/uno.config.ts index 150f2e03e..b3c954d55 100644 --- a/packages/whisper-webgpu/uno.config.ts +++ b/packages/whisper-webgpu/uno.config.ts @@ -1,3 +1,19 @@ +import { defineConfig, mergeConfigs, presetWebFonts } from 'unocss' import UnoCSSConfig from '../../uno.config' -export default UnoCSSConfig +export default defineConfig(mergeConfigs([ + UnoCSSConfig, + { + presets: [ + presetWebFonts({ + fonts: { + 'sans': 'DM Sans', + 'serif': 'DM Serif Display', + 'mono': 'DM Mono', + 'cute': 'Kiwi Maru', + 'cute-en': 'Sniglet', + }, + }), + ], + }, +])) diff --git a/uno.config.ts b/uno.config.ts index 3d506eca5..8b62c0d70 100644 --- a/uno.config.ts +++ b/uno.config.ts @@ -4,7 +4,6 @@ import { presetIcons, presetTypography, presetUno, - presetWebFonts, transformerDirectives, transformerVariantGroup, } from 'unocss' @@ -17,15 +16,6 @@ export default defineConfig({ scale: 1.2, }), presetTypography(), - presetWebFonts({ - fonts: { - 'sans': 'DM Sans', - 'serif': 'DM Serif Display', - 'mono': 'DM Mono', - 'cute': 'Kiwi Maru', - 'cute-en': 'Sniglet', - }, - }), ], transformers: [ transformerDirectives(),