Skip to content
This repository was archived by the owner on Sep 20, 2024. It is now read-only.

Commit 64f6098

Browse files
committed
Merge branch 'release/css-props' of https://github.com/chakra-ui/chakra-ui-vue into release/css-props
2 parents eaf1a70 + c5ddd66 commit 64f6098

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

.storybook/config.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@ import {
3737
} from '@fortawesome/free-brands-svg-icons'
3838

3939
Vue.use(Chakra, {
40+
extendTheme: {
41+
fonts: {
42+
heading: "'Comic Sans MS'",
43+
body: "'Comic Sans MS'",
44+
monospace: "'Comic Sans MS'"
45+
}
46+
},
4047
icons: {
4148
iconPack: 'fa',
4249
iconSet: {

packages/chakra-ui-core/src/CReset/CReset.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@ const defaultConfig = theme => ({
1515
color: theme.colors.gray[800],
1616
bg: undefined,
1717
borderColor: theme.colors.gray[200],
18-
placeholderColor: theme.colors.gray[400]
18+
placeholderColor: theme.colors.gray[400],
19+
fontFamily: theme.fonts.body
1920
},
2021
dark: {
2122
color: theme.colors.whiteAlpha[900],
2223
bg: theme.colors.gray[800],
2324
borderColor: theme.colors.whiteAlpha[300],
24-
placeholderColor: theme.colors.whiteAlpha[400]
25+
placeholderColor: theme.colors.whiteAlpha[400],
26+
fontFamily: theme.fonts.body
2527
}
2628
})
2729

@@ -59,13 +61,14 @@ const CReset = {
5961
}
6062
},
6163
created () {
62-
const { color, bg, borderColor, placeholderColor } = this.styleConfig[this.colorMode]
64+
const { color, bg, borderColor, placeholderColor, fontFamily } = this.styleConfig[this.colorMode]
6365
useTailwindPreflight(this.theme)
6466
injectGlobal({
6567
html: {
6668
lineHeight: 1.5,
6769
color,
68-
backgroundColor: bg
70+
backgroundColor: bg,
71+
fontFamily
6972
},
7073

7174
'*, *::before, *::after': {

0 commit comments

Comments
 (0)