Skip to content

Commit 9033db1

Browse files
authored
Fix duplicated grays (#743)
Removes figure-gray-secondary-alt in favor of figure-gray-tertiary which already had the exact same color values. Fixes fill-quaternary to have different colors in dark and light mode.
1 parent f537d6b commit 9033db1

File tree

3 files changed

+13
-15
lines changed

3 files changed

+13
-15
lines changed

assets/stylesheets/core/_colors.scss

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ $base-colors: (
1111
light: rgb(102, 102, 102),
1212
dark: rgb(204, 204, 204),
1313
),
14+
figure-gray-tertiary: (
15+
light: rgb(102, 102, 102),
16+
dark: rgb(176, 176, 176),
17+
),
1418
figure-blue: (
1519
light: rgb(51, 102, 255),
1620
dark: rgb(0, 153, 255),
@@ -27,19 +31,14 @@ $base-colors: (
2731
light: rgb(240, 240, 240),
2832
dark: rgb(42, 42, 42),
2933
),
30-
fill-quaternary: rgb(40, 40, 40),
34+
fill-quaternary: (
35+
light: rgb(220, 220, 220),
36+
dark: rgb(66, 66, 66),
37+
),
3138
fill-gray-tertiary: (
3239
light: rgb(240, 240, 240),
3340
dark: rgb(66, 66, 66),
3441
),
35-
figure-gray-tertiary: (
36-
light: rgb(102, 102, 102),
37-
dark: rgb(176, 176, 176),
38-
),
39-
figure-gray-secondary-alt: (
40-
light: rgb(102, 102, 102),
41-
dark: rgb(176, 176, 176),
42-
),
4342
fill-gray: (
4443
light: rgb(204, 204, 204),
4544
dark: rgb(87, 87, 87),

assets/stylesheets/core/colors/_dark.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
--color-fill: #{dark-color(fill)};
77
--color-fill-secondary: #{dark-color(fill-secondary)};
88
--color-fill-tertiary: #{dark-color(fill-tertiary)};
9+
--color-fill-quaternary: #{dark-color(fill-quaternary)};
910
--color-fill-blue: #{dark-color(fill-blue)};
1011
--color-fill-gray: #{dark-color(fill-gray)};
1112
--color-fill-gray-secondary: #{dark-color(fill-gray-secondary)};
@@ -15,7 +16,6 @@
1516
--color-figure-blue: #{dark-color(figure-blue)};
1617
--color-figure-gray: #{dark-color(figure-gray)};
1718
--color-figure-gray-secondary: #{dark-color(figure-gray-secondary)};
18-
--color-figure-gray-secondary-alt: #{dark-color(figure-gray-secondary-alt)};
1919
--color-figure-gray-tertiary: #{dark-color(figure-gray-tertiary)};
2020
--color-figure-green: #{dark-color(figure-green)};
2121
--color-figure-light-gray: #{dark-color(figure-light-gray)};

assets/stylesheets/core/colors/_light.scss

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
--color-fill: #{light-color(fill)};
77
--color-fill-secondary: #{light-color(fill-secondary)};
88
--color-fill-tertiary: #{light-color(fill-tertiary)};
9-
--color-fill-quaternary: #{base-color(fill-quaternary)};
9+
--color-fill-quaternary: #{light-color(fill-quaternary)};
1010
--color-fill-blue: #{light-color(fill-blue)};
1111
--color-fill-gray: #{light-color(fill-gray)};
1212
--color-fill-gray-secondary: #{light-color(fill-gray-secondary)};
@@ -16,7 +16,6 @@
1616
--color-figure-blue: #{light-color(figure-blue)};
1717
--color-figure-gray: #{light-color(figure-gray)};
1818
--color-figure-gray-secondary: #{light-color(figure-gray-secondary)};
19-
--color-figure-gray-secondary-alt: #{light-color(figure-gray-secondary-alt)};
2019
--color-figure-gray-tertiary: #{light-color(figure-gray-tertiary)};
2120
--color-figure-green: #{light-color(figure-green)};
2221
--color-figure-light-gray: #{light-color(figure-light-gray)};
@@ -71,7 +70,7 @@
7170
);
7271
--color-code-background: var(--color-fill-secondary);
7372
--color-code-collapsible-background: var(--color-fill-tertiary);
74-
--color-code-collapsible-text: var(--color-figure-gray-secondary-alt);
73+
--color-code-collapsible-text: var(--color-figure-gray-tertiary);
7574
--color-code-plain: var(--color-figure-gray);
7675
--color-content-table-content-color: var(--color-fill-secondary);
7776
--color-dropdown-background: #{transparentize(light-color(fill), 0.2)};
@@ -98,7 +97,7 @@
9897
--color-hero-eyebrow: #{dark-color(figure-gray-secondary)};
9998
--color-link: var(--color-figure-blue);
10099
--color-loading-placeholder-background: var(--color-fill);
101-
--color-nav-color: #{light-color(figure-gray-secondary-alt)};
100+
--color-nav-color: #{light-color(figure-gray-tertiary)};
102101
--color-nav-current-link: #{change-color(
103102
light-color(figure-gray),
104103
$alpha: 0.6
@@ -125,7 +124,7 @@
125124
light-color(fill),
126125
$alpha: 0.4
127126
)};
128-
--color-nav-dark-color: #{dark-color(figure-gray-secondary-alt)};
127+
--color-nav-dark-color: #{dark-color(figure-gray-tertiary)};
129128
--color-nav-dark-current-link: #{change-color(
130129
dark-color(figure-gray),
131130
$alpha: 0.6

0 commit comments

Comments
 (0)