Skip to content

Commit b2134db

Browse files
committed
refactor: rename secondary semantic tokens to neutral, remove primary and add highlight tokens
1 parent 06810e4 commit b2134db

2 files changed

Lines changed: 37 additions & 42 deletions

File tree

dist/css/semantic/color.css

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
/* semantic/color.css */
66
@layer tokens {
77
:root {
8-
--color-accent: var(--color-sienna-600);
9-
--color-accent-hover: var(--color-sienna-700);
10-
--color-accent-muted: var(--color-sienna-100);
11-
--color-accent-strong: var(--color-sienna-900);
8+
--color-accent: var(--color-brand);
9+
--color-accent-hover: var(--color-brand-hover);
10+
--color-accent-muted: var(--color-brand-muted);
11+
--color-accent-strong: var(--color-brand-strong);
1212
--color-active: var(--color-accent);
1313
--color-backdrop: oklch(from var(--color-black) l c h / var(--opacity-backdrop));
1414
--color-background: var(--color-white);
@@ -37,6 +37,9 @@
3737
--color-dark-strong: var(--color-black);
3838
--color-focus: var(--color-text);
3939
--color-heading: var(--color-black);
40+
--color-highlight: var(--color-yellow-100);
41+
--color-highlight-hover: var(--color-yellow-200);
42+
--color-highlight-strong: var(--color-yellow-900);
4043
--color-info: var(--color-blue-600);
4144
--color-info-hover: var(--color-blue-700);
4245
--color-info-muted: var(--color-blue-100);
@@ -48,14 +51,10 @@
4851
--color-link: var(--color-text);
4952
--color-link-active: var(--color-active);
5053
--color-link-hover: var(--color-accent);
51-
--color-primary: var(--color-brand);
52-
--color-primary-hover: var(--color-brand-hover);
53-
--color-primary-muted: var(--color-brand-muted);
54-
--color-primary-strong: var(--color-brand-strong);
55-
--color-secondary: var(--color-gray-600);
56-
--color-secondary-hover: var(--color-gray-700);
57-
--color-secondary-muted: var(--color-gray-100);
58-
--color-secondary-strong: var(--color-gray-800);
54+
--color-neutral: var(--color-gray-600);
55+
--color-neutral-hover: var(--color-gray-700);
56+
--color-neutral-muted: var(--color-gray-100);
57+
--color-neutral-strong: var(--color-gray-800);
5958
--color-shadow: var(--color-black);
6059
--color-shadow-light: oklch(from var(--color-shadow) l c h / var(--opacity-shadow));
6160
--color-shadow-medium: oklch(from var(--color-shadow) l c h / var(--opacity-backdrop));
@@ -72,11 +71,11 @@
7271
--color-text-on-brand: var(--color-white);
7372
--color-text-on-danger: var(--color-white);
7473
--color-text-on-dark: var(--color-white);
74+
--color-text-on-highlight: var(--color-text);
7575
--color-text-on-info: var(--color-white);
7676
--color-text-on-light: var(--color-gray-900);
7777
--color-text-on-muted: var(--color-gray-900);
78-
--color-text-on-primary: var(--color-white);
79-
--color-text-on-secondary: var(--color-white);
78+
--color-text-on-neutral: var(--color-white);
8079
--color-text-on-success: var(--color-white);
8180
--color-text-on-surface: var(--color-text);
8281
--color-text-on-warning: var(--color-gray-900);

tokens/semantic/color.json

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
"color": {
33
"accent": {
44
"default": {
5-
"$value": "{color.sienna.600}",
5+
"$value": "{color.brand.default}",
66
"$type": "color"
77
},
88
"hover": {
9-
"$value": "{color.sienna.700}",
9+
"$value": "{color.brand.hover}",
1010
"$type": "color"
1111
},
1212
"muted": {
13-
"$value": "{color.sienna.100}",
13+
"$value": "{color.brand.muted}",
1414
"$type": "color"
1515
},
1616
"strong": {
17-
"$value": "{color.sienna.900}",
17+
"$value": "{color.brand.strong}",
1818
"$type": "color"
1919
}
2020
},
@@ -144,6 +144,20 @@
144144
"$value": "{color.black}",
145145
"$type": "color"
146146
},
147+
"highlight": {
148+
"default": {
149+
"$value": "{color.yellow.100}",
150+
"$type": "color"
151+
},
152+
"hover": {
153+
"$value": "{color.yellow.200}",
154+
"$type": "color"
155+
},
156+
"strong": {
157+
"$value": "{color.yellow.900}",
158+
"$type": "color"
159+
}
160+
},
147161
"info": {
148162
"default": {
149163
"$value": "{color.blue.600}",
@@ -194,25 +208,7 @@
194208
"$type": "color"
195209
}
196210
},
197-
"primary": {
198-
"default": {
199-
"$value": "{color.brand.default}",
200-
"$type": "color"
201-
},
202-
"hover": {
203-
"$value": "{color.brand.hover}",
204-
"$type": "color"
205-
},
206-
"muted": {
207-
"$value": "{color.brand.muted}",
208-
"$type": "color"
209-
},
210-
"strong": {
211-
"$value": "{color.brand.strong}",
212-
"$type": "color"
213-
}
214-
},
215-
"secondary": {
211+
"neutral": {
216212
"default": {
217213
"$value": "{color.gray.600}",
218214
"$type": "color"
@@ -299,6 +295,10 @@
299295
"$value": "{color.white}",
300296
"$type": "color"
301297
},
298+
"onHighlight": {
299+
"$value": "{color.text.default}",
300+
"$type": "color"
301+
},
302302
"onInfo": {
303303
"$value": "{color.white}",
304304
"$type": "color"
@@ -311,11 +311,7 @@
311311
"$value": "{color.gray.900}",
312312
"$type": "color"
313313
},
314-
"onPrimary": {
315-
"$value": "{color.white}",
316-
"$type": "color"
317-
},
318-
"onSecondary": {
314+
"onNeutral": {
319315
"$value": "{color.white}",
320316
"$type": "color"
321317
},

0 commit comments

Comments
 (0)