Skip to content

Commit ed93c50

Browse files
authored
Fix bugs in table styles (#2316)
* Update table styles * keep checkpoint dotted lines above border * keep head cell and body cell borders lining up correctly * turn off workspace row border when sticky * update table container background * fix view bg color * use calc in checkpoints
1 parent d99d1cb commit ed93c50

File tree

2 files changed

+21
-33
lines changed

2 files changed

+21
-33
lines changed

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

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding;
243243
.bullet {
244244
&::after {
245245
content: '';
246-
height: 100%;
247-
top: 0;
246+
height: calc(100% + 1px);
247+
top: -1px;
248248
right: calc(50% - 0.5px);
249249
position: absolute;
250250
border-right: 1px dotted rgb(127, 127, 127);
@@ -253,7 +253,7 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding;
253253
}
254254
&:first-of-type {
255255
.bullet::after {
256-
height: 50%;
256+
height: calc(50% + 1px);
257257
top: 50%;
258258
clip-path: inset(0 0 0 0);
259259
}
@@ -271,6 +271,7 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding;
271271
.tableContainer {
272272
overflow: auto;
273273
flex: 1;
274+
background-color: $experiments-view-bg-color;
274275
}
275276
.table {
276277
display: inline-block;
@@ -293,24 +294,17 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding;
293294

294295
.tr {
295296
position: relative;
297+
background-color: $row-bg-color;
296298

297299
&:hover:not(.rowSelected) {
298300
.td:not(.experimentCell),
299301
.experimentCell:before {
300302
background-color: $row-hover-background-color;
301303
}
302304

303-
.td:hover {
304-
border-right-color: $border-color;
305+
.td:hover,
306+
.td:hover + .td {
305307
border-left-color: $border-color;
306-
307-
&:first-child:before {
308-
border-right-color: $border-color;
309-
}
310-
311-
&:last-child {
312-
border-right-color: transparent;
313-
}
314308
}
315309
}
316310

@@ -331,7 +325,9 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding;
331325
}
332326

333327
&.rowSelected {
334-
background-color: $row-bg-selected-color;
328+
.td {
329+
background-color: $row-bg-selected-color;
330+
}
335331

336332
> *:first-child {
337333
background-color: $row-bg-color;
@@ -343,18 +339,8 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding;
343339
}
344340
}
345341

346-
.table.withExpColumnShadow {
347-
.tr > *:first-child {
348-
border-right-width: 0;
349-
350-
&:after {
351-
box-shadow: 3px 0px 3px $shadow;
352-
}
353-
354-
&:hover:before {
355-
border-right-width: 0;
356-
}
357-
}
342+
.table.withExpColumnShadow .tr > *:first-child:after {
343+
box-shadow: 3px 0px 3px $shadow;
358344
}
359345

360346
.bodyRow {
@@ -437,6 +423,10 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding;
437423

438424
&.withShadow {
439425
box-shadow: 0 5px 8px -2px $shadow;
426+
427+
.tr {
428+
border-bottom: none;
429+
}
440430
}
441431

442432
.td {
@@ -467,6 +457,7 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding;
467457
white-space: nowrap;
468458
min-width: 0;
469459
position: relative;
460+
background-color: $row-bg-color;
470461
}
471462
.th {
472463
height: auto;
@@ -499,10 +490,6 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding;
499490
border-right: none;
500491
border-left: none;
501492

502-
&:before {
503-
border-right: 1px solid transparent;
504-
}
505-
506493
.innerCell {
507494
justify-content: flex-start;
508495

@@ -553,10 +540,10 @@ $workspace-row-edge-margin: $edge-padding - $cell-padding;
553540

554541
.placeholderHeaderCell {
555542
background-color: $header-bg-color;
556-
border-right: 1px solid $header-border-color;
543+
border-left: 1px solid $header-border-color;
557544

558-
&:last-child {
559-
border-right: none;
545+
&:first-child {
546+
border-left: none;
560547
}
561548
}
562549

webview/src/shared/variables.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ $deps-color: var(--vscode-dvc-deps);
1010
$changed-color: var(--vscode-dvc-workspaceChanged);
1111
$error-color: var(--vscode-errorForeground);
1212

13+
$experiments-view-bg-color: var(--vscode-menu-background);
1314
$row-bg-color: $bg-color;
1415
$header-fg-color: $fg-color;
1516
$row-bg-alt-color: var(--vscode-sideBar-background);

0 commit comments

Comments
 (0)