Skip to content

Commit 7b36915

Browse files
committed
chore:BED-7215 update color tokens, add comments in plugin file
1 parent a39f7f2 commit 7b36915

2 files changed

Lines changed: 29 additions & 15 deletions

File tree

packages/javascript/doodle-ui/src/tailwind/plugin.ts

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ const plugin: PluginCreator = ({ addBase, addUtilities }) => {
2020
addBase({
2121
' :root': {
2222
// SHARED (same in light and dark)
23-
// '--common-dark': common.dark,
24-
// '--common-white': common.white,
23+
'--common-dark': common.dark,
24+
'--common-white': common.white,
2525

2626
// // UTILITIES / risk level
2727
// '--risk-critical': palette.purple.A300,
@@ -43,13 +43,15 @@ const plugin: PluginCreator = ({ addBase, addUtilities }) => {
4343

4444
// END OF SHARED
4545

46-
// MAIN
47-
'--primary': light.primary.main,
46+
// MAIN / new colors - 1:1 name match in Figma
47+
'--primary': light.primary.main /* failsafe until useTheme is removed.*/,
48+
'--primary-main': light.primary.main,
4849
'--primary-variant': light.primary.variant,
49-
'--secondary': light.secondary.main,
50+
'--secondary': light.secondary.main /* failsafe until useTheme is removed.*/,
5051
'--secondary-main': light.secondary.main,
5152
'--secondary-variant': light.secondary.variant,
52-
// '--tertiary': light.tertiary.main,
53+
// '--tertiary': light.tertiary.main, /* failsafe until useTheme is removed.*/
54+
// '--tertiary-main': light.tertiary.main,
5355
// '--tertiary-variant': light.tertiary.variant,
5456
'--disabled': light.disabled,
5557

@@ -70,7 +72,7 @@ const plugin: PluginCreator = ({ addBase, addUtilities }) => {
7072
// '--text-light': text.light,
7173
// '--text-contrast': common.white,
7274
'--text-disabled': light.text.disabled,
73-
// '--text-primary': light.primary.main,
75+
'--text-primary': light.primary.main,
7476
// '--text-secondary': light.secondary.main,
7577

7678
// LINKS
@@ -196,7 +198,9 @@ const plugin: PluginCreator = ({ addBase, addUtilities }) => {
196198
// '--icon-disabled': palette.grey[700],
197199
// '--divider': palette.neutral.light[500],
198200

199-
// Legacy below
201+
// End of MAIN / new colors
202+
203+
// Legacy below - these colors will be phased out over time
200204
// same as palette.neutral.dark[50]
201205
'--contrast': '#121212',
202206

@@ -235,13 +239,14 @@ const plugin: PluginCreator = ({ addBase, addUtilities }) => {
235239
},
236240

237241
'.dark': {
238-
// MAIN
242+
// MAIN / new colors - 1:1 name match in Figma
239243
'--primary': dark.primary.main,
244+
'--primary-main': dark.primary.main,
240245
'--primary-variant': dark.primary.variant,
241246
'--secondary': dark.secondary.main,
242247
'--secondary-main': dark.secondary.main,
243248
'--secondary-variant': dark.secondary.variant,
244-
// '--tertiary': dark.tertiary.main,
249+
// '--tertiary-main': dark.tertiary.main,
245250
// '--tertiary-variant': dark.tertiary.variant,
246251
'--disabled': dark.disabled,
247252

@@ -262,7 +267,7 @@ const plugin: PluginCreator = ({ addBase, addUtilities }) => {
262267
// '--text-light': dark.text.light,
263268
// '--text-contrast': common.dark,
264269
'--text-disabled': common.disabled,
265-
// '--text-primary': dark.primary.main,
270+
'--text-primary': dark.primary.main,
266271
// '--text-secondary': dark.secondary.main,
267272

268273
// LINKS
@@ -388,7 +393,9 @@ const plugin: PluginCreator = ({ addBase, addUtilities }) => {
388393
// '--icon-disabled': common.disabled,
389394
// '--divider': palette.neutral.dark[500],
390395

391-
///////////// Legacy below //////////
396+
// End of Main / new colors
397+
398+
///////////// Legacy below ////////// these colors will be phased out over time
392399
// same as common.white
393400
'--contrast': '#ffffff',
394401
// same palette.neutral.dark[50]
@@ -402,6 +409,7 @@ const plugin: PluginCreator = ({ addBase, addUtilities }) => {
402409
'--error': '#e9827c',
403410
},
404411
}),
412+
// Helpers
405413
addUtilities({
406414
'.focus-ring': {
407415
outline: 'var(--focus-ring-width) solid var(--focus-ring)',

packages/javascript/doodle-ui/src/tailwind/preset.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,20 @@ export default {
3030
},
3131
extend: {
3232
colors: {
33-
primary: 'var(--primary)',
33+
primary: 'var(--primary-main)',
34+
'primary-main':
35+
'var(--primary-main)' /* failsafe for any classes possibly using the optional '-main' suffix*/,
3436
'primary-variant': 'var(--primary-variant)',
3537

3638
secondary: 'var(--secondary-main)',
39+
'secondary-main':
40+
'var(--secondary-main)' /* failsafe for any classes possibly using the optional '-main' suffix*/,
3741
'secondary-variant': 'var(--secondary-variant)',
3842
'secondary-variant-2': 'var(--secondary-variant-2)',
3943

40-
tertiary: 'var(--tertiary)',
44+
tertiary: 'var(--tertiary-main)',
45+
'tertiary-main':
46+
'var(--tertiary-main)' /* failsafe for any classes possibly using the optional '-main' suffix*/,
4147
'tertiary-variant': 'var(--tertiary-variant)',
4248

4349
'text-main': 'var(--text-main)',
@@ -79,7 +85,7 @@ export default {
7985
// tertiary: 'var(--tertiary)',
8086
// 'tertiary-variant': 'var(--tertiary-variant)',
8187

82-
// 'common-dark': 'var(--common-dark)',
88+
'common-dark': 'var(--common-dark)',
8389
// 'common-white': 'var(--common-white)',
8490

8591
// contrast: 'var(--common-dark)',

0 commit comments

Comments
 (0)