Skip to content

Commit ae02a87

Browse files
authored
[Darkside] Named brand-color tokens (#3559)
* 💄 Update background Header * 💄 Update popover padding for smaller screens * 💄 Adjusted borders * 💄 Uses Alpha-tokens for zebra-stripes in Table * 💄 Stronger border for hovered timeline items, transparent track bg * 💄 Transparent lines for Tabs to contrast colored bg * 💄 New icons for Table-sorting * 💄 Selected exoanded item now has accent colors * 💄 Keeps border-color for active state in search-button * 💄 Removed hover-color change on checked radio * 💄 Only non-responsive or left-static guidepanels shrink on tablet or below * 📝 Changeset * 🚚 -hover tokens are now soft-hover * ✨ Added soft-pressed token * 💄 Use new soft-pressed token where applicable * 💄 Default colored text is now 1000, strong replaced by subtle * 🏷️ Updated primitive types for new text-tokens * 🚚 Migrated old text-role-strong color to text-role-default * 🚚 Migrated referansesider to new text-colors * 🚚 Referansesider uses new soft-hover token * 🐛 Fallback to updated accent-color * [Darkside] Removed 'base' as neutral role replacement (#3556) * ♻️ Remove default-scale as replacement for neutral in config * 🧪 Setup chromatic-run for complete build * 🚚 Text migrated * 🚚 Text icon migrated * 🚚 Text contrast migrated * 🚚 bg soft migrated to neutral * 🚚 bg moderate migrated to neutral * 🚚 bg strong migrated to neutral * 🚚 border default migrated to neutral * 🚚 border subtle migrated to neutral * 🚚 border strong migrated to neutral * ⬅️ Revert chromatic preview * 🚚 Migrated referansesider to new neutral scale * 🚚 Use named brand and meta-colors * 🚚 Referansesider uses new brand-names token
1 parent 2558874 commit ae02a87

File tree

11 files changed

+170
-168
lines changed

11 files changed

+170
-168
lines changed

@navikt/core/css/darkside/tag.darkside.css

+12-12
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,22 @@
6161
--__axc-tag-text-strong: var(--ax-text-neutral-contrast);
6262
}
6363

64-
.navds-tag--meta-1,
64+
.navds-tag--meta-purple,
6565
.navds-tag--alt1 {
66-
--__axc-tag-border: var(--ax-border-meta-1);
67-
--__axc-tag-bg: var(--ax-bg-meta-1-moderateA);
68-
--__axc-tag-bg-strong: var(--ax-bg-meta-1-strong);
69-
--__axc-tag-text: var(--ax-text-meta-1);
70-
--__axc-tag-text-strong: var(--ax-text-meta-1-contrast);
66+
--__axc-tag-border: var(--ax-border-meta-purple);
67+
--__axc-tag-bg: var(--ax-bg-meta-purple-moderateA);
68+
--__axc-tag-bg-strong: var(--ax-bg-meta-purple-strong);
69+
--__axc-tag-text: var(--ax-text-meta-purple);
70+
--__axc-tag-text-strong: var(--ax-text-meta-purple-contrast);
7171
}
7272

73-
.navds-tag--meta-2,
73+
.navds-tag--meta-lime,
7474
.navds-tag--alt2 {
75-
--__axc-tag-border: var(--ax-border-meta-2);
76-
--__axc-tag-bg: var(--ax-bg-meta-2-moderateA);
77-
--__axc-tag-bg-strong: var(--ax-bg-meta-2-strong);
78-
--__axc-tag-text: var(--ax-text-meta-2);
79-
--__axc-tag-text-strong: var(--ax-text-meta-2-contrast);
75+
--__axc-tag-border: var(--ax-border-meta-lime);
76+
--__axc-tag-bg: var(--ax-bg-meta-lime-moderateA);
77+
--__axc-tag-bg-strong: var(--ax-bg-meta-lime-strong);
78+
--__axc-tag-text: var(--ax-text-meta-lime);
79+
--__axc-tag-text-strong: var(--ax-text-meta-lime-contrast);
8080
}
8181

8282
.navds-tag--small {

@navikt/core/css/tag.css

+6-6
Original file line numberDiff line numberDiff line change
@@ -128,42 +128,42 @@
128128
}
129129

130130
.navds-tag--alt1,
131-
.navds-tag--outline.navds-tag--meta-1 {
131+
.navds-tag--outline.navds-tag--meta-purple {
132132
border-color: var(--ac-tag-alt-1-border, var(--a-border-alt-1));
133133
background-color: var(--ac-tag-alt-1-bg, var(--a-surface-alt-1-subtle));
134134
color: var(--ac-tag-alt-1-text, var(--a-text-default));
135135
}
136136

137137
.navds-tag--alt1-filled,
138-
.navds-tag--strong.navds-tag--meta-1 {
138+
.navds-tag--strong.navds-tag--meta-purple {
139139
border-color: transparent;
140140
background-color: var(--ac-tag-alt-1-filled-bg, var(--a-surface-alt-1));
141141
color: var(--ac-tag-alt-1-filled-text, var(--a-text-on-alt-1));
142142
}
143143

144144
.navds-tag--alt1-moderate,
145-
.navds-tag--moderate.navds-tag--meta-1 {
145+
.navds-tag--moderate.navds-tag--meta-purple {
146146
border-color: transparent;
147147
background-color: var(--ac-tag-alt-1-moderate-bg, var(--a-surface-alt-1-moderate));
148148
color: var(--ac-tag-alt-1-moderate-text, var(--a-text-default));
149149
}
150150

151151
.navds-tag--alt2,
152-
.navds-tag--outline.navds-tag--meta-2 {
152+
.navds-tag--outline.navds-tag--meta-lime {
153153
border-color: var(--ac-tag-alt-2-border, var(--a-border-alt-2));
154154
background-color: var(--ac-tag-alt-2-bg, var(--a-surface-alt-2-subtle));
155155
color: var(--ac-tag-alt-2-text, var(--a-text-default));
156156
}
157157

158158
.navds-tag--alt2-filled,
159-
.navds-tag--strong.navds-tag--meta-2 {
159+
.navds-tag--strong.navds-tag--meta-lime {
160160
border-color: transparent;
161161
background-color: var(--ac-tag-alt-2-filled-bg, var(--a-surface-alt-2));
162162
color: var(--ac-tag-alt-2-filled-text, var(--a-text-on-alt-2));
163163
}
164164

165165
.navds-tag--alt2-moderate,
166-
.navds-tag--moderate.navds-tag--meta-2 {
166+
.navds-tag--moderate.navds-tag--meta-lime {
167167
border-color: transparent;
168168
background-color: var(--ac-tag-alt-2-moderate-bg, var(--a-surface-alt-2-moderate));
169169
color: var(--ac-tag-alt-2-moderate-text, var(--a-text-default));

@navikt/core/react/src/layout/box/Box.stories.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ export const BoxNewDarksideLight: Story = {
407407
<Box.New
408408
background="accent-moderate"
409409
shadow="dialog"
410-
borderColor="brand-1-strong"
410+
borderColor="brand-magenta-strong"
411411
borderWidth="2"
412412
padding="5"
413413
paddingInline="20"
@@ -423,7 +423,7 @@ export const BoxNewDarksideDark: Story = {
423423
<Box.New
424424
background="accent-moderate"
425425
shadow="dialog"
426-
borderColor="brand-1-strong"
426+
borderColor="brand-magenta-strong"
427427
borderWidth="2"
428428
padding="5"
429429
paddingInline="20"

@navikt/core/react/src/tag/Tag.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ export interface TagProps extends HTMLAttributes<HTMLSpanElement> {
3434
| "alt3-moderate";
3535

3636
/* Temp hide these until naming is resolved */
37-
// | "meta-1"
38-
// | "meta-1-filled"
39-
// | "meta-1-moderate"
40-
// | "meta-2"
41-
// | "meta-2-filled"
42-
// | "meta-2-moderate";
37+
// | "meta-purple"
38+
// | "meta-purple-filled"
39+
// | "meta-purple-moderate"
40+
// | "meta-lime"
41+
// | "meta-lime-filled"
42+
// | "meta-lime-moderate";
4343
/**
4444
* @default "medium"
4545
*/

@navikt/core/tokens/darkside/tokens/global-dark.ts

+56-56
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export const globalColorDarkModeConfigWithoutAlpha: Record<
7777
"900": { value: "#f28ea2", type: "global-color", group: "danger" },
7878
"1000": { value: "#f6b7cd", type: "global-color", group: "danger" },
7979
},
80-
/* Info is currently just a copy of brandThree */
80+
/* Info is currently just a copy of brandBlue */
8181
info: {
8282
"100": { value: "#071e2d", type: "global-color", group: "info" },
8383
"200": { value: "#0d2534", type: "global-color", group: "info" },
@@ -90,64 +90,64 @@ export const globalColorDarkModeConfigWithoutAlpha: Record<
9090
"900": { value: "#93afc0", type: "global-color", group: "info" },
9191
"1000": { value: "#b7cbd7", type: "global-color", group: "info" },
9292
},
93-
"brand-1": {
94-
"100": { value: "#321220", type: "global-color", group: "brand-1" },
95-
"200": { value: "#3a1827", type: "global-color", group: "brand-1" },
96-
"300": { value: "#42202e", type: "global-color", group: "brand-1" },
97-
"400": { value: "#4e2a39", type: "global-color", group: "brand-1" },
98-
"500": { value: "#a35276", type: "global-color", group: "brand-1" },
99-
"600": { value: "#b06886", type: "global-color", group: "brand-1" },
100-
"700": { value: "#be7f99", type: "global-color", group: "brand-1" },
101-
"800": { value: "#c58aa2", type: "global-color", group: "brand-1" },
102-
"900": { value: "#cf9eb1", type: "global-color", group: "brand-1" },
103-
"1000": { value: "#e1c0cc", type: "global-color", group: "brand-1" },
93+
"brand-magenta": {
94+
"100": { value: "#321220", type: "global-color", group: "brand-magenta" },
95+
"200": { value: "#3a1827", type: "global-color", group: "brand-magenta" },
96+
"300": { value: "#42202e", type: "global-color", group: "brand-magenta" },
97+
"400": { value: "#4e2a39", type: "global-color", group: "brand-magenta" },
98+
"500": { value: "#a35276", type: "global-color", group: "brand-magenta" },
99+
"600": { value: "#b06886", type: "global-color", group: "brand-magenta" },
100+
"700": { value: "#be7f99", type: "global-color", group: "brand-magenta" },
101+
"800": { value: "#c58aa2", type: "global-color", group: "brand-magenta" },
102+
"900": { value: "#cf9eb1", type: "global-color", group: "brand-magenta" },
103+
"1000": { value: "#e1c0cc", type: "global-color", group: "brand-magenta" },
104104
},
105-
"brand-2": {
106-
"100": { value: "#2d160e", type: "global-color", group: "brand-2" },
107-
"200": { value: "#351d15", type: "global-color", group: "brand-2" },
108-
"300": { value: "#3d241c", type: "global-color", group: "brand-2" },
109-
"400": { value: "#493027", type: "global-color", group: "brand-2" },
110-
"500": { value: "#975e4a", type: "global-color", group: "brand-2" },
111-
"600": { value: "#ab6f5b", type: "global-color", group: "brand-2" },
112-
"700": { value: "#c0836e", type: "global-color", group: "brand-2" },
113-
"800": { value: "#c78e79", type: "global-color", group: "brand-2" },
114-
"900": { value: "#d1a08c", type: "global-color", group: "brand-2" },
115-
"1000": { value: "#e3c2b1", type: "global-color", group: "brand-2" },
105+
"brand-beige": {
106+
"100": { value: "#2d160e", type: "global-color", group: "brand-beige" },
107+
"200": { value: "#351d15", type: "global-color", group: "brand-beige" },
108+
"300": { value: "#3d241c", type: "global-color", group: "brand-beige" },
109+
"400": { value: "#493027", type: "global-color", group: "brand-beige" },
110+
"500": { value: "#975e4a", type: "global-color", group: "brand-beige" },
111+
"600": { value: "#ab6f5b", type: "global-color", group: "brand-beige" },
112+
"700": { value: "#c0836e", type: "global-color", group: "brand-beige" },
113+
"800": { value: "#c78e79", type: "global-color", group: "brand-beige" },
114+
"900": { value: "#d1a08c", type: "global-color", group: "brand-beige" },
115+
"1000": { value: "#e3c2b1", type: "global-color", group: "brand-beige" },
116116
},
117-
"brand-3": {
118-
"100": { value: "#071e2d", type: "global-color", group: "brand-3" },
119-
"200": { value: "#0d2534", type: "global-color", group: "brand-3" },
120-
"300": { value: "#122d3e", type: "global-color", group: "brand-3" },
121-
"400": { value: "#19394c", type: "global-color", group: "brand-3" },
122-
"500": { value: "#43718d", type: "global-color", group: "brand-3" },
123-
"600": { value: "#5a839b", type: "global-color", group: "brand-3" },
124-
"700": { value: "#7396ab", type: "global-color", group: "brand-3" },
125-
"800": { value: "#7f9fb3", type: "global-color", group: "brand-3" },
126-
"900": { value: "#93afc0", type: "global-color", group: "brand-3" },
127-
"1000": { value: "#b7cbd7", type: "global-color", group: "brand-3" },
117+
"brand-blue": {
118+
"100": { value: "#071e2d", type: "global-color", group: "brand-blue" },
119+
"200": { value: "#0d2534", type: "global-color", group: "brand-blue" },
120+
"300": { value: "#122d3e", type: "global-color", group: "brand-blue" },
121+
"400": { value: "#19394c", type: "global-color", group: "brand-blue" },
122+
"500": { value: "#43718d", type: "global-color", group: "brand-blue" },
123+
"600": { value: "#5a839b", type: "global-color", group: "brand-blue" },
124+
"700": { value: "#7396ab", type: "global-color", group: "brand-blue" },
125+
"800": { value: "#7f9fb3", type: "global-color", group: "brand-blue" },
126+
"900": { value: "#93afc0", type: "global-color", group: "brand-blue" },
127+
"1000": { value: "#b7cbd7", type: "global-color", group: "brand-blue" },
128128
},
129-
"meta-1": {
130-
"100": { value: "#221a2c", type: "global-color", group: "meta-1" },
131-
"200": { value: "#272032", type: "global-color", group: "meta-1" },
132-
"300": { value: "#2f273a", type: "global-color", group: "meta-1" },
133-
"400": { value: "#3a3245", type: "global-color", group: "meta-1" },
134-
"500": { value: "#776491", type: "global-color", group: "meta-1" },
135-
"600": { value: "#8876a1", type: "global-color", group: "meta-1" },
136-
"700": { value: "#9b8bb0", type: "global-color", group: "meta-1" },
137-
"800": { value: "#a495b7", type: "global-color", group: "meta-1" },
138-
"900": { value: "#b2a7c3", type: "global-color", group: "meta-1" },
139-
"1000": { value: "#cdc5d9", type: "global-color", group: "meta-1" },
129+
"meta-purple": {
130+
"100": { value: "#221a2c", type: "global-color", group: "meta-purple" },
131+
"200": { value: "#272032", type: "global-color", group: "meta-purple" },
132+
"300": { value: "#2f273a", type: "global-color", group: "meta-purple" },
133+
"400": { value: "#3a3245", type: "global-color", group: "meta-purple" },
134+
"500": { value: "#776491", type: "global-color", group: "meta-purple" },
135+
"600": { value: "#8876a1", type: "global-color", group: "meta-purple" },
136+
"700": { value: "#9b8bb0", type: "global-color", group: "meta-purple" },
137+
"800": { value: "#a495b7", type: "global-color", group: "meta-purple" },
138+
"900": { value: "#b2a7c3", type: "global-color", group: "meta-purple" },
139+
"1000": { value: "#cdc5d9", type: "global-color", group: "meta-purple" },
140140
},
141-
"meta-2": {
142-
"100": { value: "#1c1f00", type: "global-color", group: "meta-2" },
143-
"200": { value: "#222500", type: "global-color", group: "meta-2" },
144-
"300": { value: "#292d00", type: "global-color", group: "meta-2" },
145-
"400": { value: "#343900", type: "global-color", group: "meta-2" },
146-
"500": { value: "#6a7200", type: "global-color", group: "meta-2" },
147-
"600": { value: "#7c8400", type: "global-color", group: "meta-2" },
148-
"700": { value: "#8f9800", type: "global-color", group: "meta-2" },
149-
"800": { value: "#99a200", type: "global-color", group: "meta-2" },
150-
"900": { value: "#a9b325", type: "global-color", group: "meta-2" },
151-
"1000": { value: "#c5d14c", type: "global-color", group: "meta-2" },
141+
"meta-lime": {
142+
"100": { value: "#1c1f00", type: "global-color", group: "meta-lime" },
143+
"200": { value: "#222500", type: "global-color", group: "meta-lime" },
144+
"300": { value: "#292d00", type: "global-color", group: "meta-lime" },
145+
"400": { value: "#343900", type: "global-color", group: "meta-lime" },
146+
"500": { value: "#6a7200", type: "global-color", group: "meta-lime" },
147+
"600": { value: "#7c8400", type: "global-color", group: "meta-lime" },
148+
"700": { value: "#8f9800", type: "global-color", group: "meta-lime" },
149+
"800": { value: "#99a200", type: "global-color", group: "meta-lime" },
150+
"900": { value: "#a9b325", type: "global-color", group: "meta-lime" },
151+
"1000": { value: "#c5d14c", type: "global-color", group: "meta-lime" },
152152
},
153153
} as const;

0 commit comments

Comments
 (0)