Skip to content

Commit bd08a53

Browse files
Replace static colors with VSCode CSS variables (#1682)
* Remove light colors * Replace most colors with VSCode variable equivalents Co-authored-by: mattseddon <[email protected]>
1 parent b7871d7 commit bd08a53

File tree

3 files changed

+10
-77
lines changed

3 files changed

+10
-77
lines changed

webview/src/experiments/components/table/styles.module.scss

Lines changed: 9 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,14 @@ $edge-padding: 0.8rem;
1212
$cell-padding: 0.5rem;
1313
$workspace-row-edge-margin: $edge-padding - $cell-padding;
1414

15-
// Dark Theme
16-
17-
$row-bg-alt-color: var(--vscode-sideBar-background);
18-
$header-bg-color: #303031;
19-
$meta-cell-color: #a0a0a0;
20-
$toggle-color: rgba(255, 255, 255, 0.21);
21-
$spinner-color: rgb(255, 255, 255);
2215
$metrics-color: #fbd38d;
2316
$params-color: #90cdf4;
24-
25-
// Light theme
26-
27-
$header-bg-color-light: #e1e1e1;
28-
$border-color-light: #7f7f7f;
29-
$metrics-color-light: #ce9f4c;
30-
$params-color-light: #76add1;
31-
$toggle-color-light: rgba(0, 0, 0, 0.21);
32-
$spinner-color-light: #000;
17+
$row-bg-alt-color: var(--vscode-sideBar-background);
18+
$header-bg-color: var(--vscode-dropdown-background);
19+
$meta-cell-color: var(--vscode-descriptionForeground);
20+
$changed-color: var(--vscode-gitDecoration-modifiedResourceForeground);
3321

3422
// Extendable Silent Rules
35-
3623
%expandableRowArrow {
3724
width: 8px;
3825
height: 8px;
@@ -45,10 +32,6 @@ $spinner-color-light: #000;
4532
border-left: unset;
4633
transition: transform 0.2s, right 0.2s, bottom 0.2s;
4734
margin: 12px 6px;
48-
49-
:global(.vscode-light) & {
50-
border-color: $toggle-color-light;
51-
}
5235
}
5336

5437
%truncateLeftParent {
@@ -118,11 +101,7 @@ $spinner-color-light: #000;
118101
}
119102

120103
.workspaceWithChanges.normalExperiment & {
121-
background-color: $metrics-color;
122-
123-
:global(.vscode-light) & {
124-
background-color: $metrics-color-light;
125-
}
104+
background-color: $changed-color;
126105
}
127106

128107
.unselectedExperiment & {
@@ -138,11 +117,7 @@ $spinner-color-light: #000;
138117
}
139118

140119
.workspaceWithChanges.unselectedExperiment & {
141-
border: 1px solid $metrics-color;
142-
143-
:global(.vscode-light) & {
144-
border: 1px solid $metrics-color-light;
145-
}
120+
border: 1px solid $changed-color;
146121
}
147122

148123
.queuedExperiment & {
@@ -158,26 +133,13 @@ $spinner-color-light: #000;
158133
border-top: 1.5px solid currentColor;
159134
animation: spin 1s cubic-bezier(0.53, 0.21, 0.29, 0.67) infinite;
160135
background-color: $bg-color;
161-
162-
@at-root {
163-
:global(.vscode-light) & {
164-
border-right-color: $spinner-color-light;
165-
border-top-color: $spinner-color-light;
166-
}
167-
}
168136
}
169137
.runningExperiment.oddRow & {
170138
background-color: $row-bg-alt-color;
171139
}
172140
.workspaceWithChanges.runningExperiment & {
173-
border-right-color: $metrics-color;
174-
border-top-color: $metrics-color;
175-
@at-root {
176-
:global(.vscode-light) & {
177-
border-right-color: $metrics-color-light;
178-
border-top-color: $metrics-color-light;
179-
}
180-
}
141+
border-right-color: $changed-color;
142+
border-top-color: $changed-color;
181143
}
182144

183145
.runningExperiment.oddRow > .firstCell & {
@@ -305,19 +267,11 @@ $spinner-color-light: #000;
305267
.paramHeaderCell,
306268
&.paramHeaderCell {
307269
color: $params-color;
308-
309-
:global(.vscode-light) & {
310-
color: $params-color-light;
311-
}
312270
}
313271

314272
.metricHeaderCell,
315273
&.metricHeaderCell {
316274
color: $metrics-color;
317-
318-
:global(.vscode-light) & {
319-
color: $metrics-color-light;
320-
}
321275
}
322276
}
323277

@@ -384,11 +338,7 @@ $spinner-color-light: #000;
384338
}
385339

386340
.workspaceChange {
387-
color: $metrics-color;
388-
389-
:global(.vscode-light) & {
390-
color: $metrics-color-light;
391-
}
341+
color: $changed-color;
392342
}
393343

394344
.td,
@@ -423,10 +373,6 @@ $spinner-color-light: #000;
423373
.placeholderHeaderCell {
424374
background-color: $header-bg-color;
425375
border-right: 2px solid $bg-color;
426-
427-
:global(.vscode-light) & {
428-
background-color: $header-bg-color-light;
429-
}
430376
}
431377

432378
.headerCell {

webview/src/shared/components/emptyState/styles.module.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,4 @@
1717
opacity: 0.8;
1818
letter-spacing: 0.04em;
1919
color: $watermark-color;
20-
21-
@at-root {
22-
:global(.vscode-light) & {
23-
color: $watermark-color-light;
24-
}
25-
}
2620
}

webview/src/shared/variables.scss

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
$fg-color: var(--vscode-editor-foreground);
22
$bg-color: var(--vscode-editor-background);
33
$bullet-size: 9px;
4-
5-
// Dark
6-
7-
$watermark-color: rgba(255, 255, 255, 0.6);
8-
9-
// Light
10-
11-
$watermark-color-light: rgba(0, 0, 0, 0.68);
4+
$watermark-color: var(--vscode-descriptionForeground);

0 commit comments

Comments
 (0)