Skip to content

Commit 1b9ec5f

Browse files
fix(vitrify): define fontFamily in QuasarPreset theme
1 parent 848b594 commit 1b9ec5f

4 files changed

Lines changed: 15 additions & 5 deletions

File tree

.changeset/many-meals-tan.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'vitrify': patch
3+
---
4+
5+
fix(vitrify): define fontFamily in QuasarPreset theme

packages/vitrify/src/node/plugins/quasar/unocss/core/typography.unocss.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@ const preflights: Preflight<QuasarTheme>[] = [
77
body {
88
min-width: 100px;
99
min-height: 100%;
10-
font-family: "Roboto", "-apple-system", "Helvetica Neue", Helvetica, Arial, sans-serif;
10+
font-family: ${theme.typography.fontFamily};
1111
-ms-text-size-adjust: 100%;
1212
-webkit-text-size-adjust: 100%;
1313
-webkit-font-smoothing: antialiased;
1414
-moz-osx-font-smoothing: grayscale;
1515
font-smoothing: antialiased;
1616
line-height: 1.5;
1717
font-size: 14px;
18+
margin: 0;
19+
box-sizing: border-box
1820
}
1921
2022
h1 {

packages/vitrify/src/node/plugins/quasar/unocss/index.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1881,10 +1881,6 @@ textarea {
18811881
margin: 0;
18821882
}
18831883
1884-
html, body
1885-
margin: 0
1886-
box-sizing: border-box
1887-
18881884
/* beasties:include end */`
18891885
}
18901886
] as Preflight<QuasarTheme>[]

packages/vitrify/src/node/plugins/quasar/unocss/theme.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
export interface QuasarTheme {
2+
typography: {
3+
fontFamily: string
4+
}
25
breakpoints: {
36
xs: string
47
sm: string
@@ -1145,6 +1148,10 @@ export interface QuasarTheme {
11451148
}
11461149

11471150
const defaultTheme: QuasarTheme = {
1151+
typography: {
1152+
fontFamily:
1153+
'"Roboto", "-apple-system", "Helvetica Neue", Helvetica, Arial, sans-serif'
1154+
},
11481155
breakpoints: {
11491156
xs: '0',
11501157
sm: '600px',

0 commit comments

Comments
 (0)