Skip to content

Commit 1679aa9

Browse files
design-tokens(dark): update grey tokens and dark theme muted/hover/pressed + border-muted; react-native: use bg-section for BottomSheet surface
Co-authored-by: George Marshall <georgewrmarshall@users.noreply.github.com>
1 parent 1d48478 commit 1679aa9

7 files changed

Lines changed: 46 additions & 46 deletions

File tree

packages/design-system-react-native/src/components/BottomSheetDialog/BottomSheetDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ export const BottomSheetDialog = forwardRef<
232232
const sheetStyle = useMemo(
233233
() => [
234234
tw.style(
235-
'bg-default rounded-t-3xl overflow-hidden border border-muted',
235+
'bg-section rounded-t-3xl overflow-hidden border border-muted',
236236
twClassName,
237237
),
238238
{

packages/design-tokens/src/css/brand-colors.css

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
/* Grey */
1010
--brand-colors-grey-grey100: #ededed;
1111
--brand-colors-grey-grey200: #babbbe;
12-
--brand-colors-grey-grey300: #a3a4a7;
13-
--brand-colors-grey-grey400: #949596;
14-
--brand-colors-grey-grey500: #66676a;
15-
--brand-colors-grey-grey600: #47484a;
16-
--brand-colors-grey-grey700: #333333;
17-
--brand-colors-grey-grey800: #262626;
18-
--brand-colors-grey-grey900: #1a1a1a;
12+
--brand-colors-grey-grey300: #9aa5b0;
13+
--brand-colors-grey-grey400: #8897a5;
14+
--brand-colors-grey-grey500: #5a646e;
15+
--brand-colors-grey-grey600: #41484e;
16+
--brand-colors-grey-grey700: #262b30;
17+
--brand-colors-grey-grey800: #1e2226;
18+
--brand-colors-grey-grey900: #16191c;
1919
--brand-colors-grey-grey1000: #000000;
2020
--brand-colors-grey-grey050: #f3f3f4;
2121
--brand-colors-grey-grey000: #ffffff;

packages/design-tokens/src/css/dark-theme-colors.css

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
/* Applied to interactive elements, such as buttons.
1515
For dark mode, we apply pure white with 10%, 15%, and 20% opacities
1616
so these tokens inherit the background hue. */
17-
--color-background-muted: #ffffff1a;
18-
--color-background-muted-hover: #ffffff26;
19-
--color-background-muted-pressed: #ffffff33;
17+
--color-background-muted: #c8e4ff1c;
18+
--color-background-muted-hover: #c8e4ff26;
19+
--color-background-muted-pressed: #c8e4ff30;
2020

2121
/* Ensures visual consistency with section and subsection. */
2222
--color-background-default-hover: var(--brand-colors-grey-grey900);
@@ -29,8 +29,8 @@
2929
/* These have opacities of pure white for general usage.
3030
We set 10% for hover and 15% for pressed so these tokens pick up
3131
background hues and are consistent with +1 and +2 elevations.*/
32-
--color-background-hover: #ffffff1a;
33-
--color-background-pressed: #ffffff26;
32+
--color-background-hover: #c8e4ff1c;
33+
--color-background-pressed: #c8e4ff26;
3434

3535
/* These are our content colors.
3636
Contrast ratio of alternative: 7.4 on default, 8.5 on section.
@@ -51,7 +51,7 @@
5151
We use 10% opacity of pure white for border-muted so it maintains
5252
sufficient contrast on bg-default and bg-section.*/
5353
--color-border-default: var(--brand-colors-grey-grey500);
54-
--color-border-muted: #ffffff1a;
54+
--color-border-muted: #c8e4ff26;
5555

5656
/* Derived from the same hue as bg-default, 264.5, for visual
5757
consistency. Ensures we don't have too much "red".

packages/design-tokens/src/figma/brandColors.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,43 +13,43 @@
1313
"description": ""
1414
},
1515
"300": {
16-
"value": "#a3a4a7",
16+
"value": "#9aa5b0",
1717
"type": "color",
1818
"parent": "Brand Colors/v2- brand evo (preview)",
1919
"description": ""
2020
},
2121
"400": {
22-
"value": "#949596",
22+
"value": "#8897a5",
2323
"type": "color",
2424
"parent": "Brand Colors/v2- brand evo (preview)",
2525
"description": ""
2626
},
2727
"500": {
28-
"value": "#66676a",
28+
"value": "#5a646e",
2929
"type": "color",
3030
"parent": "Brand Colors/v2- brand evo (preview)",
3131
"description": ""
3232
},
3333
"600": {
34-
"value": "#47484a",
34+
"value": "#41484e",
3535
"type": "color",
3636
"parent": "Brand Colors/v2- brand evo (preview)",
3737
"description": ""
3838
},
3939
"700": {
40-
"value": "#333333",
40+
"value": "#262b30",
4141
"type": "color",
4242
"parent": "Brand Colors/v2- brand evo (preview)",
4343
"description": ""
4444
},
4545
"800": {
46-
"value": "#262626",
46+
"value": "#1e2226",
4747
"type": "color",
4848
"parent": "Brand Colors/v2- brand evo (preview)",
4949
"description": ""
5050
},
5151
"900": {
52-
"value": "#1a1a1a",
52+
"value": "#16191c",
5353
"type": "color",
5454
"parent": "Brand Colors/v2- brand evo (preview)",
5555
"description": ""

packages/design-tokens/src/figma/darkTheme.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"description": "For subsection bg usually over background/section."
2626
},
2727
"muted": {
28-
"value": "#ffffff1a",
28+
"value": "#c8e4ff1c",
2929
"type": "color",
3030
"parent": "Theme Colors/Dark mode",
3131
"description": "For muted neutral surface."
@@ -55,25 +55,25 @@
5555
"description": "Pressed state surface for background/alternative."
5656
},
5757
"muted-hover": {
58-
"value": "#ffffff26",
58+
"value": "#c8e4ff26",
5959
"type": "color",
6060
"parent": "Theme Colors/Dark mode",
6161
"description": "Hover state surface for background/muted."
6262
},
6363
"muted-pressed": {
64-
"value": "#ffffff33",
64+
"value": "#c8e4ff30",
6565
"type": "color",
6666
"parent": "Theme Colors/Dark mode",
6767
"description": "Pressed state surface for background/muted."
6868
},
6969
"hover": {
70-
"value": "#ffffff1a",
70+
"value": "#c8e4ff1c",
7171
"type": "color",
7272
"parent": "Theme Colors/Dark mode",
7373
"description": "General purpose hover state tint."
7474
},
7575
"pressed": {
76-
"value": "#ffffff26",
76+
"value": "#c8e4ff26",
7777
"type": "color",
7878
"parent": "Theme Colors/Dark mode",
7979
"description": "General purpose pressed state tint."
@@ -145,7 +145,7 @@
145145
"description": "Default color for borders."
146146
},
147147
"muted": {
148-
"value": "#ffffff1a",
148+
"value": "#c8e4ff26",
149149
"type": "color",
150150
"parent": "Theme Colors/Dark mode",
151151
"description": "Muted color for borders."

packages/design-tokens/src/js/brandColor/brandColor.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ export const brandColor: BrandColor = {
66
// Grey
77
grey200: '#babbbe',
88
// Grey
9-
grey300: '#a3a4a7',
9+
grey300: '#9aa5b0',
1010
// Grey
11-
grey400: '#949596',
11+
grey400: '#8897a5',
1212
// Grey
13-
grey500: '#66676a',
13+
grey500: '#5a646e',
1414
// Grey
15-
grey600: '#47484a',
15+
grey600: '#41484e',
1616
// Grey
17-
grey700: '#333333',
17+
grey700: '#262b30',
1818
// Grey
19-
grey800: '#262626',
19+
grey800: '#1e2226',
2020
// Grey
21-
grey900: '#1a1a1a',
21+
grey900: '#16191c',
2222
// Grey
2323
grey1000: '#000000',
2424
// Grey

packages/design-tokens/src/js/themes/darkTheme/colors.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ export const colors: ThemeColors = {
1111
section: brandColor.grey900,
1212
/** For subsection bg usually over background/section (grey800 / #262626) */
1313
subsection: brandColor.grey800,
14-
/** For muted neutral surface (#ffffff1a) */
15-
muted: '#ffffff1a',
14+
/** For muted neutral surface (#c8e4ff1c) */
15+
muted: '#c8e4ff1c',
1616
/** Hover state surface for background/default (grey900 / #1a1a1a) */
1717
defaultHover: brandColor.grey900,
1818
/** Pressed state surface for background/default (grey800 / #262626) */
@@ -21,14 +21,14 @@ export const colors: ThemeColors = {
2121
alternativeHover: '#0d0d0e',
2222
/** Pressed state surface for background/alternative (#161617) */
2323
alternativePressed: '#161617',
24-
/** Hover state surface for background/muted (#ffffff26) */
25-
mutedHover: '#ffffff26',
26-
/** Pressed state surface for background/muted (#ffffff33) */
27-
mutedPressed: '#ffffff33',
28-
/** General purpose hover state tint (#ffffff1a) */
29-
hover: '#ffffff1a',
30-
/** General purpose pressed state tint (#ffffff26) */
31-
pressed: '#ffffff26',
24+
/** Hover state surface for background/muted (#c8e4ff26) */
25+
mutedHover: '#c8e4ff26',
26+
/** Pressed state surface for background/muted (#c8e4ff30) */
27+
mutedPressed: '#c8e4ff30',
28+
/** General purpose hover state tint (#c8e4ff1c) */
29+
hover: '#c8e4ff1c',
30+
/** General purpose pressed state tint (#c8e4ff26) */
31+
pressed: '#c8e4ff26',
3232
},
3333
text: {
3434
/** Default color for text (#FFFFFF) */
@@ -55,8 +55,8 @@ export const colors: ThemeColors = {
5555
border: {
5656
/** Default color for borders */
5757
default: brandColor.grey500,
58-
/** Muted color for borders (#ffffff1a) */
59-
muted: '#ffffff1a',
58+
/** Muted color for borders (#c8e4ff26) */
59+
muted: '#c8e4ff26',
6060
},
6161
overlay: {
6262
/** Default color for overlays (scrim) (#030304b8) */

0 commit comments

Comments
 (0)