Skip to content

Improve table styles #2197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 17, 2022
Merged

Improve table styles #2197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94f0557
Improve table styles
julieg18 Aug 16, 2022
b803ab7
Fix more bugs
julieg18 Aug 16, 2022
56c27db
Update bullet and spinner bg on selected rows
julieg18 Aug 17, 2022
093905a
Merge branch 'main' into improve-table-styles
julieg18 Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 47 additions & 4 deletions webview/src/experiments/components/table/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,22 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding;
background-color: $bg-color;
}

.unselectedExperiment:not(.rowSelected):hover & {
background-color: $row-hover-background-color;
}

.unselectedExperiment:not(.rowSelected) .experimentCell:hover & {
background-color: $cell-hover-background-color;
}

.workspaceWithChanges.unselectedExperiment & {
border: 1px solid $changed-color;
}

.rowSelected.unselectedExperiment & {
background-color: $row-bg-selected-color;
}

.queuedExperiment & {
display: none;
}
Expand All @@ -148,10 +160,28 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding;
background-color: $bg-color;
}

.runningExperiment:not(.rowSelected):hover & {
background-color: $row-hover-background-color;
border-left-color: $row-hover-background-color;
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;
}

.rowSelected.runningExperiment & {
background-color: $row-bg-selected-color;
border-left-color: $row-bg-selected-color;
border-bottom-color: $row-bg-selected-color;
}
}
}

Expand Down Expand Up @@ -254,12 +284,14 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding;
position: relative;

&:hover:not(.rowSelected) {
.td {
.td:not(.experimentCell),
.experimentCell:before {
background-color: $row-hover-background-color;
}

&:hover {
background-color: $cell-hover-background-color;
}
.td:hover:not(.experimentCell),
.experimentCell:hover:before {
background-color: $cell-hover-background-color;
}
}

Expand Down Expand Up @@ -709,6 +741,17 @@ $badge-size: 0.85rem;
}

.experimentCell {
&:before {
content: '';
top: 0;
right: 0;
width: 100%;
height: 100%;
z-index: -1;
position: absolute;
background-color: transparent;
}

.innerCell {
.indicatorCount {
display: none;
Expand Down
2 changes: 1 addition & 1 deletion webview/src/shared/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ $bg-color: var(--vscode-editor-background);
$bullet-size: 9px;
$watermark-color: var(--vscode-descriptionForeground);

$border-color: var(--checkbox-border);
$border-color: var(--vscode-checkbox-border);
Copy link
Contributor

@mattseddon mattseddon Aug 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is at least one more of these in this file. --button-primary-background

Copy link
Contributor Author

@julieg18 julieg18 Aug 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird, that variable actually doesn't have a vscode prefixed version 🤔

$metrics-color: var(--vscode-dvc-metrics);
$params-color: var(--vscode-dvc-params);
$deps-color: var(--vscode-dvc-deps);
Expand Down