From 1cc0f1c43ecc041fc08ccbc8afd434007823c02e Mon Sep 17 00:00:00 2001 From: julieg18 Date: Thu, 18 Aug 2022 18:49:25 -0500 Subject: [PATCH 1/3] Clean up styles --- .../components/table/styles.module.scss | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/webview/src/experiments/components/table/styles.module.scss b/webview/src/experiments/components/table/styles.module.scss index d0b432f239..da4a9d1faf 100644 --- a/webview/src/experiments/components/table/styles.module.scss +++ b/webview/src/experiments/components/table/styles.module.scss @@ -133,10 +133,6 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding; background-color: $row-hover-background-color; } - .unselectedExperiment:not(.rowSelected) .experimentCell:hover & { - background-color: $cell-hover-background-color; - } - .workspaceWithChanges.unselectedExperiment & { border: 1px solid $changed-color; } @@ -166,12 +162,6 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding; border-bottom-color: $row-hover-background-color; } - .runningExperiment:not(.rowSelected) .experimentCell:hover & { - background-color: $cell-hover-background-color; - border-left-color: $cell-hover-background-color; - border-bottom-color: $cell-hover-background-color; - } - .workspaceWithChanges.runningExperiment & { border-right-color: $changed-color; border-top-color: $changed-color; @@ -289,9 +279,17 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding; background-color: $row-hover-background-color; } - .td:hover:not(.experimentCell), - .experimentCell:hover:before { - background-color: $cell-hover-background-color; + .td:hover { + border-right-color: $border-color; + border-left-color: $border-color; + + &:first-child:before { + border-right-color: $border-color; + } + + &:last-child { + border-right-color: transparent; + } } } @@ -444,6 +442,8 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding; font-size: 0.8rem; line-height: 2rem; align-items: center; + border-right: 1px solid transparent; + border-left: 1px solid transparent; &:first-child { .innerCell { @@ -461,6 +461,12 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding; display: flex; flex-flow: row nowrap; text-align: left; + border-right: none; + border-left: none; + + &:before { + border-right: 1px solid transparent; + } .innerCell { justify-content: flex-start; From 7d12c7c064eeb6fddb9b4397976a9c6d1c3bb71a Mon Sep 17 00:00:00 2001 From: julieg18 Date: Thu, 18 Aug 2022 18:52:32 -0500 Subject: [PATCH 2/3] Add missing file --- webview/src/shared/variables.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/webview/src/shared/variables.scss b/webview/src/shared/variables.scss index 6622077d1a..63f33faa4e 100644 --- a/webview/src/shared/variables.scss +++ b/webview/src/shared/variables.scss @@ -21,7 +21,6 @@ $meta-cell-color: var(--vscode-descriptionForeground); $hover-background-color: var(--vscode-list-hoverBackground); $row-hover-background-color: var(--vscode-list-hoverBackground); -$cell-hover-background-color: var(--vscode-dropdown-background); $accent-color: var(--button-primary-background); From d26305ca700a5fc319bb35a457bfd0ed50455ef1 Mon Sep 17 00:00:00 2001 From: julieg18 Date: Fri, 19 Aug 2022 10:54:41 -0500 Subject: [PATCH 3/3] Keep bullet background opaque --- .../components/table/styles.module.scss | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/webview/src/experiments/components/table/styles.module.scss b/webview/src/experiments/components/table/styles.module.scss index da4a9d1faf..7d41f75665 100644 --- a/webview/src/experiments/components/table/styles.module.scss +++ b/webview/src/experiments/components/table/styles.module.scss @@ -130,7 +130,11 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding; } .unselectedExperiment:not(.rowSelected):hover & { - background-color: $row-hover-background-color; + background-image: linear-gradient( + $row-hover-background-color, + $row-hover-background-color + ), + linear-gradient($bg-color, $bg-color); } .workspaceWithChanges.unselectedExperiment & { @@ -138,7 +142,11 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding; } .rowSelected.unselectedExperiment & { - background-color: $row-bg-selected-color; + background-image: linear-gradient( + $row-bg-selected-color, + $row-bg-selected-color + ), + linear-gradient($bg-color, $bg-color); } .queuedExperiment & { @@ -157,7 +165,11 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding; } .runningExperiment:not(.rowSelected):hover & { - background-color: $row-hover-background-color; + background-image: linear-gradient( + $row-hover-background-color, + $row-hover-background-color + ), + linear-gradient($bg-color, $bg-color); border-left-color: $row-hover-background-color; border-bottom-color: $row-hover-background-color; } @@ -168,7 +180,11 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding; } .rowSelected.runningExperiment & { - background-color: $row-bg-selected-color; + background-image: linear-gradient( + $row-bg-selected-color, + $row-bg-selected-color + ), + linear-gradient($bg-color, $bg-color); border-left-color: $row-bg-selected-color; border-bottom-color: $row-bg-selected-color; }