Skip to content

Commit 8d9574e

Browse files
authored
Update table indicators and chevrons/stars styles (#2367)
* update indicator, matching style to VSCode * update chevrons and stars, updating icon colors to match VSCode trees
1 parent 37191b7 commit 8d9574e

File tree

2 files changed

+19
-31
lines changed

2 files changed

+19
-31
lines changed

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

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding;
1717
left: 0;
1818
display: inline-block;
1919
position: absolute;
20-
border: 2px solid $watermark-color;
21-
opacity: 0.5;
20+
border: 2px solid $row-action-icon-color;
2221
border-top: unset;
2322
border-left: unset;
2423
transition: transform 0.2s, right 0.2s, bottom 0.2s;
@@ -338,10 +337,6 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding;
338337
background-color: $row-hover-background-color;
339338
}
340339

341-
.indicatorCount {
342-
border-color: $row-hover-background-color;
343-
}
344-
345340
.td:hover,
346341
.td:hover + .td {
347342
border-left-color: $border-color;
@@ -379,19 +374,9 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding;
379374
}
380375
}
381376

382-
.indicatorCount {
383-
background-color: $indicator-selected-badge-background;
384-
color: $indicator-selected-badge-foreground;
385-
border: 1px solid $indicator-selected-badge-border;
386-
}
387-
388-
.starSwitch:not([aria-checked='true']) svg {
389-
fill: $star-switch-selection-fill-color;
390-
}
391-
392377
.expandedRowArrow,
393378
.contractedRowArrow {
394-
border-color: $star-switch-selection-fill-color;
379+
border-color: $row-action-selected-icon-color;
395380
}
396381
}
397382
}
@@ -571,7 +556,6 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding;
571556
align-items: center;
572557
justify-content: center;
573558
width: 14px;
574-
opacity: 0.4;
575559
cursor: pointer;
576560

577561
&[aria-checked='true'] {
@@ -621,6 +605,14 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding;
621605
}
622606
}
623607

608+
.experimentCell .rowActions .starSwitch svg {
609+
fill: $row-action-icon-color;
610+
611+
.rowSelected & {
612+
fill: $row-action-selected-icon-color;
613+
}
614+
}
615+
624616
.webviewHeader {
625617
display: flex;
626618
justify-content: space-between;
@@ -820,17 +812,13 @@ $badge-size: 0.85rem;
820812
font-weight: bold;
821813
background-color: $indicator-badge-background;
822814
color: $indicator-badge-foreground;
823-
border: 1px solid $indicator-badge-border;
824815
border-radius: 100%;
825816
width: $badge-size;
826817
height: $badge-size;
827818
line-height: $badge-size;
828819
text-align: center;
829820
vertical-align: middle;
830821
font-size: 0.5rem;
831-
display: flex;
832-
justify-content: center;
833-
align-items: center;
834822
}
835823

836824
.cellTooltip {
@@ -859,7 +847,7 @@ $badge-size: 0.85rem;
859847
.indicatorCount {
860848
display: none;
861849
.experimentGroup & {
862-
display: flex;
850+
display: block;
863851
&[aria-label='0'] {
864852
display: none;
865853
}

webview/src/shared/variables.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ $row-hover-background-color: var(--vscode-list-hoverBackground);
2727

2828
$accent-color: var(--button-primary-background);
2929

30-
$indicator-badge-background: var(--vscode-badge-background);
31-
$indicator-badge-foreground: var(--vscode-badge-foreground);
32-
$indicator-badge-border: $row-bg-color;
33-
$indicator-selected-badge-border: $row-bg-selected-color;
34-
$indicator-selected-badge-background: $accent-color;
35-
$indicator-selected-badge-foreground: var(--button-primary-foreground);
36-
37-
$star-switch-selection-fill-color: var(--vscode-list-focusHighlightForeground);
30+
$indicator-badge-background: var(--vscode-activityBarBadge-background);
31+
$indicator-badge-foreground: var(--vscode-activityBarBadge-foreground);
32+
33+
$row-action-icon-color: var(--vscode-icon-foreground);
34+
$row-action-selected-icon-color: var(
35+
--vscode-list-activeSelectionIconForeground,
36+
var(--vscode-icon-foreground)
37+
);
3838

3939
$shadow: var(--vscode-widget-shadow);
4040

0 commit comments

Comments
 (0)