Skip to content

Commit a979561

Browse files
committed
Spilt semantic tokens and semantic colours to two distinct files
+Simplified some DSTheme calls and added more semantic tokens + removed unused palette tokens css
1 parent 144c3e1 commit a979561

4 files changed

Lines changed: 212 additions & 458 deletions

File tree

src/styles/diamondDS/diamond-colors-primitives.css

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -27,44 +27,9 @@
2727
--ds-white-a11: #ffffffe6;
2828
--ds-white-a12: #fffffff2;
2929
--ds-whiteChannel: 255 255 255;
30-
31-
/* Disabled tokens (semantic) */
32-
--ds-fg-disabled: var(--ds-olive-8);
33-
--ds-border-disabled: var(--ds-olive-6);
34-
--ds-bg-disabled: var(--ds-olive-a3);
35-
36-
/* Borders */
37-
--ds-border-subtle: var(--ds-olive-6); /* Structural, non-interactive */
38-
--ds-border-strong: var(--ds-olive-7); /* Interactive baseline */
39-
--ds-border-emphasis: var(--ds-olive-8); /* Interactive emphasis */
40-
4130
}
4231

4332
:root, .light, :root[data-mode="light"] { /*LIGHT MODE */
44-
/* Semantic on-colour tokens */
45-
--ds-fg-fixed-white: var(--ds-white); /* Always white */
46-
--ds-fg-fixed-black: var(--ds-black); /* Always black */
47-
--ds-fg-inverse: var(--ds-white); /* White (light) → Black (dark) */
48-
--ds-fg-default: var(--ds-black); /* Black (light) → White (dark) */
49-
50-
--ds-overlay-hover: rgba(0, 0, 0, 0.06);
51-
--ds-overlay-selected: rgba(0, 0, 0, 0.10);
52-
--ds-overlay-focus: rgba(0, 0, 0, 0.12);
53-
--ds-overlay-disabled: rgba(0, 0, 0, 0.26);
54-
--ds-overlay-disabled-bg: rgba(0, 0, 0, 0.06);
55-
56-
--ds-bg-brand: var(--ds-navy-10); /* Diamond Brand Blue */
57-
58-
/* Canvas (app shell) */
59-
--ds-bg-canvas: var(--ds-olive-1);
60-
61-
/* Paper (main surface) */
62-
--ds-bg-paper: var(--ds-white);
63-
64-
/* Layering surfaces */
65-
--ds-bg-surface-1: var(--ds-olive-2);
66-
--ds-bg-surface-2: var(--ds-olive-3);
67-
6833
/* Radix based colours */
6934
--ds-gray-1:#fcfcfc;
7035
--ds-gray-2:#f9f9f9;
@@ -465,30 +430,6 @@
465430
--ds-navy-12Channel: 12 14 28;
466431
}
467432
.dark, :root[data-mode="dark"] { /* Dark Mode */
468-
/* Semantic on-colour tokens */
469-
--ds-fg-fixed-white: var(--ds-white); /* Always white */
470-
--ds-fg-fixed-black: var(--ds-black); /* Always black */
471-
--ds-fg-inverse: var(--ds-black); /* White (light) → Black (dark) */
472-
--ds-fg-default: var(--ds-white); /* Black (light) → White (dark) */
473-
474-
--ds-bg-brand: var(--ds-navy-7); /* Diamond Brand Blue */
475-
476-
--ds-overlay-hover: rgba(255, 255, 255, 0.06);
477-
--ds-overlay-selected: rgba(255, 255, 255, 0.10);
478-
--ds-overlay-focus: rgba(255, 255, 255, 0.12);
479-
--ds-overlay-disabled: rgba(255, 255, 255, 0.30);
480-
--ds-overlay-disabled-bg: rgba(255, 255, 255, 0.08);
481-
482-
/* Canvas (app shell) */
483-
--ds-bg-canvas: var(--ds-olive-1);
484-
485-
/* Paper (main surface) */
486-
--ds-bg-paper: var(--ds-olive-2);
487-
488-
/* Layering surfaces */
489-
--ds-bg-surface-1: var(--ds-olive-3);
490-
--ds-bg-surface-2: var(--ds-olive-4);
491-
492433
/* Radix based colours */
493434
--ds-gray-1:#111;
494435
--ds-gray-2:#191919;

src/styles/diamondDS/diamond-mui-palette-tokens.css

Lines changed: 0 additions & 243 deletions
This file was deleted.
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
:root { /* Semantic tokens that can be defined once */
2+
/* Borders */
3+
--ds-border-subtle: var(--ds-olive-6); /* Structural, non-interactive */
4+
--ds-border-strong: var(--ds-olive-7); /* Interactive baseline */
5+
--ds-border-emphasis: var(--ds-olive-8); /* Interactive emphasis */
6+
/* Borders for focus states */
7+
--ds-border-focus-primary: var(--ds-indigo-8);
8+
--ds-border-focus-secondary: var(--ds-navy-8);
9+
--ds-border-focus-success: var(--ds-green-8);
10+
--ds-border-focus-warning: var(--ds-orange-8);
11+
--ds-border-focus-error: var(--ds-red-8);
12+
--ds-border-focus-info: var(--ds-indigo-8);
13+
14+
/* Background tokens */
15+
--ds-bg-canvas: var(--ds-olive-1);
16+
--ds-bg-paper: var(--ds-white);
17+
--ds-bg-surface-1: var(--ds-olive-2);
18+
--ds-bg-surface-2: var(--ds-olive-3);
19+
20+
--ds-bg-interactive-rest: var(--ds-olive-3);
21+
--ds-bg-interactive-hover: var(--ds-olive-4);
22+
23+
/* Text hierarchy tokens */
24+
--ds-fg-primary: var(--ds-olive-12);
25+
--ds-fg-secondary: var(--ds-olive-11);
26+
--ds-fg-tertiary: var(--ds-olive-10);
27+
28+
/* Disabled tokens */
29+
--ds-fg-disabled: var(--ds-olive-8);
30+
--ds-border-disabled: var(--ds-olive-6);
31+
--ds-bg-disabled: var(--ds-olive-a3);
32+
}
33+
34+
:root, .light, :root[data-mode="light"] { /* Light mode */
35+
/* On-colour tokens */
36+
--ds-fg-fixed-white: var(--ds-white); /* Always white */
37+
--ds-fg-fixed-black: var(--ds-black); /* Always black */
38+
--ds-fg-inverse: var(--ds-white); /* White (light) → Black (dark) */
39+
--ds-fg-default: var(--ds-black); /* Black (light) → White (dark) */
40+
41+
--ds-overlay-hover: rgba(0, 0, 0, 0.06);
42+
--ds-overlay-selected: rgba(0, 0, 0, 0.10);
43+
--ds-overlay-focus: rgba(0, 0, 0, 0.12);
44+
--ds-overlay-disabled: rgba(0, 0, 0, 0.26);
45+
--ds-overlay-disabled-bg: rgba(0, 0, 0, 0.06);
46+
47+
--ds-bg-brand: var(--ds-navy-10); /* Diamond Brand Blue */
48+
}
49+
50+
.dark, :root[data-mode="dark"] { /* dark mode semantic overrides */
51+
/* On-colour tokens */
52+
--ds-fg-fixed-white: var(--ds-white); /* Always white */
53+
--ds-fg-fixed-black: var(--ds-black); /* Always black */
54+
--ds-fg-inverse: var(--ds-black); /* White (light) → Black (dark) */
55+
--ds-fg-default: var(--ds-white); /* Black (light) → White (dark) */
56+
57+
--ds-bg-brand: var(--ds-navy-7); /* Diamond Brand Blue */
58+
59+
--ds-overlay-hover: rgba(255, 255, 255, 0.06);
60+
--ds-overlay-selected: rgba(255, 255, 255, 0.10);
61+
--ds-overlay-focus: rgba(255, 255, 255, 0.12);
62+
--ds-overlay-disabled: rgba(255, 255, 255, 0.30);
63+
--ds-overlay-disabled-bg: rgba(255, 255, 255, 0.08);
64+
65+
/* Paper (main surface override) */
66+
--ds-bg-paper: var(--ds-olive-2);
67+
68+
}

0 commit comments

Comments
 (0)