Skip to content

Commit aa77c70

Browse files
joduplessisjoduplessis
authored
chore: use sane defaults (#347)
This better default values.
1 parent 5fbb159 commit aa77c70

5 files changed

Lines changed: 56 additions & 54 deletions

File tree

‎packages/core/src/popover/popover.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:root {
22
--f-popover-border-color: var(--f-color-border);
3-
--f-popover-border-radius: var(--f-radius);
3+
--f-popover-border-radius: var(--f-radius-lg);
44
--f-popover-background: var(--f-color-surface);
55
--f-popover-box-shadow: var(--f-shadow-popover);
66
}

‎packages/core/src/styles/reset.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
html, body {
22
background-color: transparent;
33
box-sizing: border-box;
4-
font-size: 14px;
4+
font-size: 13px;
55
font-weight: var(--f-font-weight-normal);
66
font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"
77
}

‎packages/design/config.js‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,13 @@ module.exports = {
156156
type: `value`,
157157
transitive: true,
158158
matcher: (token) => token.attributes.category == 'color',
159-
transformer: (token) => {
160-
if (token.value.includes('oklch')) return token.value
161-
const [l, c, h] = chroma(token.value).oklch()
162-
return `oklch(${l.toFixed(3)} ${c.toFixed(3)} ${isNaN(h) ? 0 : h.toFixed(1)})`
163-
},
159+
transformer: (token) => token.value.includes('oklch') ? oklchToHex(token.value) : chroma(token.value).hex(),
160+
// this keeps the oklch value
161+
// transformer: (token) => {
162+
// if (token.value.includes('oklch')) return token.value
163+
// const [l, c, h] = chroma(token.value).oklch()
164+
// return `oklch(${l.toFixed(3)} ${c.toFixed(3)} ${isNaN(h) ? 0 : h.toFixed(1)})`
165+
// },
164166
},
165167
'color/css': Object.assign({}, StyleDictionary.transform[`color/css`], {
166168
transitive: true,

‎packages/design/tokens/color.json‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,131 +2,131 @@
22
"color": {
33
"black": { "value": "oklch(0.05 0.0012 0)" },
44
"white": { "value": "oklch(0.995 0.001 0)" },
5-
"overlay": { "value": "oklch(11.907% 0.00582 285.855 / 0.65)" },
5+
"overlay": { "value": "rgba(12, 13, 18, 0.65)" },
66

77
"accent": {
88
"50": {
9-
"value": "oklch(0.962 0.018 280)"
9+
"value": "oklch(0.962 0.018 245)"
1010
},
1111
"100": {
12-
"value": "oklch(0.937 0.035 280)"
12+
"value": "oklch(0.937 0.035 245)"
1313
},
1414
"150": {
15-
"value": "oklch(0.910 0.052 280)"
15+
"value": "oklch(0.910 0.052 245)"
1616
},
1717
"200": {
18-
"value": "oklch(0.882 0.068 280)"
18+
"value": "oklch(0.882 0.068 245)"
1919
},
2020
"250": {
21-
"value": "oklch(0.842 0.093 280)"
21+
"value": "oklch(0.842 0.093 245)"
2222
},
2323
"300": {
24-
"value": "oklch(0.802 0.118 280)"
24+
"value": "oklch(0.802 0.118 245)"
2525
},
2626
"350": {
27-
"value": "oklch(0.752 0.148 280)"
27+
"value": "oklch(0.752 0.148 245)"
2828
},
2929
"400": {
30-
"value": "oklch(0.702 0.178 280)"
30+
"value": "oklch(0.702 0.178 245)"
3131
},
3232
"450": {
33-
"value": "oklch(0.650 0.204 280)"
33+
"value": "oklch(0.650 0.204 245)"
3434
},
3535
"500": {
36-
"value": "oklch(0.597 0.230 280)"
36+
"value": "oklch(0.597 0.230 245)"
3737
},
3838
"550": {
39-
"value": "oklch(0.545 0.244 280)"
39+
"value": "oklch(0.545 0.244 245)"
4040
},
4141
"600": {
42-
"value": "oklch(0.492 0.258 280)"
42+
"value": "oklch(0.492 0.258 245)"
4343
},
4444
"650": {
45-
"value": "oklch(0.445 0.248 280)"
45+
"value": "oklch(0.445 0.248 245)"
4646
},
4747
"700": {
48-
"value": "oklch(0.397 0.238 280)"
48+
"value": "oklch(0.397 0.238 245)"
4949
},
5050
"750": {
51-
"value": "oklch(0.357 0.218 280)"
51+
"value": "oklch(0.357 0.218 245)"
5252
},
5353
"800": {
54-
"value": "oklch(0.317 0.198 280)"
54+
"value": "oklch(0.317 0.198 245)"
5555
},
5656
"850": {
57-
"value": "oklch(0.285 0.173 280)"
57+
"value": "oklch(0.285 0.173 245)"
5858
},
5959
"900": {
60-
"value": "oklch(0.252 0.148 280)"
60+
"value": "oklch(0.252 0.148 245)"
6161
},
6262
"950": {
63-
"value": "oklch(0.219 0.108 280)"
63+
"value": "oklch(0.219 0.108 245)"
6464
},
6565
"1000": {
66-
"value": "oklch(0.193 0.081 280)"
66+
"value": "oklch(0.193 0.081 245)"
6767
}
6868
},
6969

7070
"base": {
7171
"50": {
72-
"value": "oklch(0.99 0.0014 280)"
72+
"value": "oklch(0.985 0.001 245)"
7373
},
7474
"100": {
75-
"value": "oklch(0.950 0.003 280)"
75+
"value": "oklch(0.950 0.003 245)"
7676
},
7777
"150": {
78-
"value": "oklch(0.925 0.0045 280)"
78+
"value": "oklch(0.925 0.0045 245)"
7979
},
8080
"200": {
81-
"value": "oklch(0.900 0.006 280)"
81+
"value": "oklch(0.900 0.006 245)"
8282
},
8383
"250": {
84-
"value": "oklch(0.865 0.009 280)"
84+
"value": "oklch(0.865 0.009 245)"
8585
},
8686
"300": {
87-
"value": "oklch(0.830 0.012 280)"
87+
"value": "oklch(0.830 0.012 245)"
8888
},
8989
"350": {
90-
"value": "oklch(0.785 0.015 280)"
90+
"value": "oklch(0.785 0.015 245)"
9191
},
9292
"400": {
93-
"value": "oklch(0.740 0.018 280)"
93+
"value": "oklch(0.740 0.018 245)"
9494
},
9595
"450": {
96-
"value": "oklch(0.688 0.019 280)"
96+
"value": "oklch(0.688 0.019 245)"
9797
},
9898
"500": {
99-
"value": "oklch(0.635 0.020 280)"
99+
"value": "oklch(0.635 0.020 245)"
100100
},
101101
"550": {
102-
"value": "oklch(0.580 0.0195 280)"
102+
"value": "oklch(0.580 0.0195 245)"
103103
},
104104
"600": {
105-
"value": "oklch(0.525 0.019 280)"
105+
"value": "oklch(0.525 0.019 245)"
106106
},
107107
"650": {
108-
"value": "oklch(0.470 0.0185 280)"
108+
"value": "oklch(0.470 0.0185 245)"
109109
},
110110
"700": {
111-
"value": "oklch(0.415 0.018 280)"
111+
"value": "oklch(0.415 0.018 245)"
112112
},
113113
"750": {
114-
"value": "oklch(0.368 0.0175 280)"
114+
"value": "oklch(0.368 0.0175 245)"
115115
},
116116
"800": {
117-
"value": "oklch(0.320 0.017 280)"
117+
"value": "oklch(0.320 0.017 245)"
118118
},
119119
"850": {
120-
"value": "oklch(0.283 0.017 280)"
120+
"value": "oklch(0.283 0.017 245)"
121121
},
122122
"900": {
123-
"value": "oklch(0.245 0.017 280)"
123+
"value": "oklch(0.245 0.017 245)"
124124
},
125125
"950": {
126-
"value": "oklch(0.208 0.017 280)"
126+
"value": "oklch(0.208 0.017 245)"
127127
},
128128
"1000": {
129-
"value": "oklch(0.19 0.017 280)"
129+
"value": "oklch(0.19 0.017 245)"
130130
}
131131
},
132132

‎packages/design/tokens/theme/light.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"light": {
33
"radius": { "value": "{radius.default}" },
4-
"focus": { "value": "2px solid {color.accent.150}" },
4+
"focus": { "value": "2px solid {color.accent.500}" },
55
"color": {
66
"background": { "value": "{color.base.50}" },
77
"accent": {
@@ -56,15 +56,15 @@
5656
},
5757
"surface": {
5858
" ": { "value": "{color.white}" },
59-
"strong": { "value": "{color.base.100}" },
60-
"stronger": { "value": "{color.base.200}" },
61-
"strongest": { "value": "{color.base.300}" },
59+
"strong": { "value": "{color.base.50}" },
60+
"stronger": { "value": "{color.base.100}" },
61+
"strongest": { "value": "{color.base.150}" },
6262
"highlight": { "value": "{color.accent.50}" },
6363
"inverse": { "value": "{color.base.800}" }
6464
},
6565
"border": {
66-
" ": { "value": "{color.base.200}" },
67-
"strong": { "value": "{color.base.300}" }
66+
" ": { "value": "{color.base.150}" },
67+
"strong": { "value": "{color.base.250}" }
6868
}
6969
}
7070
}

0 commit comments

Comments
 (0)