Skip to content

Commit 43c5b47

Browse files
committed
feat(ui): switch fonts to DM Sans and DM Mono to align with Nuxt's theme
1 parent 88220f0 commit 43c5b47

5 files changed

Lines changed: 24 additions & 16 deletions

File tree

packages/devtools-ui-kit/src/unocss.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
presetIcons,
1111
presetTypography,
1212
presetUno,
13+
presetWebFonts,
1314
transformerDirectives,
1415
transformerVariantGroup,
1516
} from 'unocss'
@@ -25,9 +26,6 @@ export function unocssPreset(): Preset {
2526
primary: '#099e61',
2627
context: 'rgba(var(--nui-c-context),%alpha)',
2728
},
28-
fontFamily: {
29-
sans: 'Avenir, Helvetica, Arial, sans-serif',
30-
},
3129
}),
3230
rules: [
3331
[/^n-(.*)$/, ([, body]: string[], { theme }: RuleContext<Theme>) => {
@@ -177,6 +175,12 @@ export function extendUnocssOptions(user: UnocssNuxtOptions = {}): UnocssNuxtOpt
177175
},
178176
// ...(user?.icons || {})
179177
}),
178+
presetWebFonts({
179+
fonts: {
180+
sans: 'DM Sans',
181+
mono: 'DM Mono',
182+
},
183+
}),
180184
unocssPreset(),
181185
...(user.presets || []),
182186
],

packages/devtools-ui-kit/unocss.config.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.

packages/devtools/client/app.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ registerCommands(() =>
8080
</script>
8181

8282
<template>
83-
<div fixed inset-0 h-screen w-screen>
83+
<div fixed inset-0 h-screen w-screen font-sans>
8484
<NuxtLoadingIndicator />
8585
<Notification />
8686
<NLoading v-if="waiting">

packages/devtools/client/unocss.config.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ export default defineConfig({
3131
}),
3232
presetWebFonts({
3333
fonts: {
34-
sans: 'Inter:400,500',
35-
mono: 'Fira Code',
34+
sans: 'DM Sans',
35+
mono: 'DM Mono',
3636
stylish: 'Caveat',
3737
},
3838
}),
@@ -52,4 +52,7 @@ export default defineConfig({
5252
'simple-icons-nuxtdotjs',
5353
'bxl-visual-studio',
5454
],
55+
configDeps: [
56+
'../../packages/devtools-ui-kit/src/unocss.ts',
57+
],
5558
})

uno.config.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,11 @@
1-
export { default } from './packages/devtools/client/unocss.config'
1+
import { defineConfig } from 'unocss'
2+
3+
import config from './packages/devtools/client/unocss.config'
4+
5+
export default defineConfig({
6+
...config,
7+
configDeps: [
8+
'./packages/devtools-ui-kit/src/unocss.ts',
9+
'./packages/devtools/client/unocss.config.ts',
10+
],
11+
})

0 commit comments

Comments
 (0)