Skip to content

Commit 9ab2b1e

Browse files
authored
fix: Fixing grid colors and grays (#1621)
- Styleguide didn't have 850 actually mapped. - dh-gray-100 is mapped to content-bg but doesn't have a Bootstrap gray-xxx counterpart, so I added a Gray-8XX for illustration while we are still mapping things - Grid row was mapped to dh-gray-200 but should have been dh-gray-300 - I added calculations for the hsl for grays instead of the all zero hue based ones I had before. They are still not exact but closer. I'm looking into fixing the rounding error. #1572
1 parent 242edb3 commit 9ab2b1e

16 files changed

Lines changed: 20 additions & 14 deletions

packages/code-studio/src/styleguide/Colors.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ function Colors(): React.ReactElement {
1212
['700', '400'],
1313
['800', '300'],
1414
['850', '200'],
15+
['8XX', '100'],
1516
['900', '75'],
1617
].map(([swatch, dh]) => (
1718
<div

packages/code-studio/src/styleguide/StyleGuide.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ pre {
6060
}
6161
}
6262

63+
.gray-swatch-850 {
64+
color: color-yiq($gray-850);
65+
background-color: $gray-850;
66+
}
67+
6368
.style-guide-container {
6469
background-color: $content-bg;
6570
padding: 1rem;

packages/components/src/theme/theme-dark/theme-dark-palette.css

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
:root {
22
/* Gray */
3-
--dh-color-gray-hue: 0deg;
4-
--dh-color-gray-50: hsl(var(--dh-color-gray-hue) 6% 10%);
5-
--dh-color-gray-75: hsl(var(--dh-color-gray-hue) 5% 13%);
6-
--dh-color-gray-100: hsl(var(--dh-color-gray-hue) 5% 17%);
7-
--dh-color-gray-200: hsl(var(--dh-color-gray-hue) 4% 19%);
8-
--dh-color-gray-300: hsl(var(--dh-color-gray-hue) 4% 21%);
9-
--dh-color-gray-400: hsl(var(--dh-color-gray-hue) 2% 25%);
10-
--dh-color-gray-500: hsl(var(--dh-color-gray-hue) 1% 36%);
11-
--dh-color-gray-600: hsl(var(--dh-color-gray-hue) 0% 57%);
12-
--dh-color-gray-700: hsl(var(--dh-color-gray-hue) 1% 75%);
13-
--dh-color-gray-800: hsl(var(--dh-color-gray-hue) 6% 94%);
14-
--dh-color-gray-900: hsl(var(--dh-color-gray-hue) 25% 98%);
3+
--dh-color-gray-hue: 219deg;
4+
--dh-color-gray-50: hsl(calc(var(--dh-color-gray-hue) + 81deg), 6%, 10%);
5+
--dh-color-gray-75: hsl(calc(var(--dh-color-gray-hue) + 61deg), 5%, 13%);
6+
--dh-color-gray-100: hsl(calc(var(--dh-color-gray-hue) + 66deg), 5%, 17%);
7+
--dh-color-gray-200: hsl(calc(var(--dh-color-gray-hue) + 66deg), 4%, 19%);
8+
--dh-color-gray-300: hsl(calc(var(--dh-color-gray-hue) + 66deg), 4%, 21%);
9+
--dh-color-gray-400: hsl(calc(var(--dh-color-gray-hue) + 61deg), 2%, 25%);
10+
--dh-color-gray-500: hsl(calc(var(--dh-color-gray-hue) + 51deg), 1%, 36%);
11+
--dh-color-gray-600: hsl(calc(var(--dh-color-gray-hue) + 81deg), 0%, 57%);
12+
--dh-color-gray-700: hsl(calc(var(--dh-color-gray-hue) - 219deg), 1%, 75%);
13+
--dh-color-gray-800: hsl(calc(var(--dh-color-gray-hue) - 159deg), 6%, 94%);
14+
--dh-color-gray-900: hsl(calc(var(--dh-color-gray-hue) - 159deg), 25%, 98%);
1515

1616
/** Black & White */
1717
--dh-color-black: var(--dh-color-gray-50);

packages/components/src/theme/theme-dark/theme-dark-semantic-grid.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
--dh-color-grid-header-bar-casing: var(--dh-color-gray-50);
1414

1515
/* Row */
16-
--dh-color-grid-row-0-bg: var(--dh-color-gray-200);
16+
--dh-color-grid-row-0-bg: var(--dh-color-gray-300);
1717
--dh-color-grid-row-1-bg: var(--dh-color-gray-100);
1818
--dh-color-grid-row-hover-bg: var(--dh-color-highlight-hover);
1919
--dh-color-grid-row-hover-bg-selected: var(
@@ -23,7 +23,7 @@
2323
/* Selection */
2424
--dh-color-grid-selection: var(--dh-color-highlight-selected);
2525
--dh-color-grid-selection-outline: var(--dh-color-accent-900);
26-
--dh-color-grid-selection-outline-casing: var(--dh-gray-50);
26+
--dh-color-grid-selection-outline-casing: var(--dh-color-gray-50);
2727

2828
/** Sroll Bar */
2929
--dh-color-grid-scroll-bar-active-selection-tick: var(--dh-color-accent-400);
152 Bytes
Loading
1.23 KB
Loading
275 Bytes
Loading
203 Bytes
Loading
1.28 KB
Loading
230 Bytes
Loading

0 commit comments

Comments
 (0)