From 1ed9a699162a6bc87f3adabeaf83fbb9442ff1f3 Mon Sep 17 00:00:00 2001 From: Lev Kokotov Date: Thu, 7 Sep 2023 14:08:33 -0700 Subject: [PATCH 1/5] fix table scss --- pgml-dashboard/src/components/tables/large/table/table.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pgml-dashboard/src/components/tables/large/table/table.scss b/pgml-dashboard/src/components/tables/large/table/table.scss index 3befa6e55..199af3beb 100644 --- a/pgml-dashboard/src/components/tables/large/table/table.scss +++ b/pgml-dashboard/src/components/tables/large/table/table.scss @@ -1,5 +1,5 @@ table.table.table-lg { - * { + td, tr { border-width: 0; } From e5383266059cb73761a344ef2d6194842a07c89b Mon Sep 17 00:00:00 2001 From: Lev Kokotov Date: Thu, 7 Sep 2023 14:14:18 -0700 Subject: [PATCH 2/5] hmm --- .../src/components/tables/large/row/row.scss | 10 +++++++--- .../src/components/tables/large/row/template.html | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pgml-dashboard/src/components/tables/large/row/row.scss b/pgml-dashboard/src/components/tables/large/row/row.scss index 7ffbc30d3..d45ec97e1 100644 --- a/pgml-dashboard/src/components/tables/large/row/row.scss +++ b/pgml-dashboard/src/components/tables/large/row/row.scss @@ -16,19 +16,19 @@ table.table.table-lg { vertical-align: middle; padding: 8px 0; - div.table-cell-content { + div.table-cell-content-inner { background: #{$gray-600}; padding: 20px 0; } &:first-of-type { - div.table-cell-content { + div.table-cell-content-inner { padding-left: 67px; } } &:last-of-type { - div.table-cell-content { + div.table-cell-content-inner { padding-right: 67px; } } @@ -42,4 +42,8 @@ table.table.table-lg { } } } + + .table-cell-content { + height: 100%; + } } diff --git a/pgml-dashboard/src/components/tables/large/row/template.html b/pgml-dashboard/src/components/tables/large/row/template.html index 442ec936e..831ac5682 100644 --- a/pgml-dashboard/src/components/tables/large/row/template.html +++ b/pgml-dashboard/src/components/tables/large/row/template.html @@ -8,7 +8,9 @@ <% for column in columns { %>
- <%+ column %> +
+ <%+ column %> +
<% } %> From b69fad02c173d9a114f632bcc9b5b011d15ccc05 Mon Sep 17 00:00:00 2001 From: Lev Kokotov Date: Thu, 7 Sep 2023 14:16:30 -0700 Subject: [PATCH 3/5] move padding --- pgml-dashboard/src/components/tables/large/row/row.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pgml-dashboard/src/components/tables/large/row/row.scss b/pgml-dashboard/src/components/tables/large/row/row.scss index d45ec97e1..c6a8d956d 100644 --- a/pgml-dashboard/src/components/tables/large/row/row.scss +++ b/pgml-dashboard/src/components/tables/large/row/row.scss @@ -2,7 +2,9 @@ table.table.table-lg { tr { &:first-of-type { td { - padding-top: 16px; + .table-cell-content { + padding-top: 16px; + } } } From a8e0e77c74762bcb27d5c47e8e9eb259aea8c88a Mon Sep 17 00:00:00 2001 From: Lev Kokotov Date: Thu, 7 Sep 2023 14:32:36 -0700 Subject: [PATCH 4/5] fix table --- .../src/components/tables/large/row/row.scss | 51 ------------------- .../components/tables/large/row/template.html | 6 +-- .../components/tables/large/table/table.scss | 35 ++++++++++++- 3 files changed, 35 insertions(+), 57 deletions(-) diff --git a/pgml-dashboard/src/components/tables/large/row/row.scss b/pgml-dashboard/src/components/tables/large/row/row.scss index c6a8d956d..e69de29bb 100644 --- a/pgml-dashboard/src/components/tables/large/row/row.scss +++ b/pgml-dashboard/src/components/tables/large/row/row.scss @@ -1,51 +0,0 @@ -table.table.table-lg { - tr { - &:first-of-type { - td { - .table-cell-content { - padding-top: 16px; - } - } - } - - &:hover, &.active { - div.table-cell-content { - background: #{$gray-800}; - } - } - - td { - vertical-align: middle; - padding: 8px 0; - - div.table-cell-content-inner { - background: #{$gray-600}; - padding: 20px 0; - } - - &:first-of-type { - div.table-cell-content-inner { - padding-left: 67px; - } - } - - &:last-of-type { - div.table-cell-content-inner { - padding-right: 67px; - } - } - } - } - - &.selectable { - tbody { - tr:hover { - cursor: pointer; - } - } - } - - .table-cell-content { - height: 100%; - } -} diff --git a/pgml-dashboard/src/components/tables/large/row/template.html b/pgml-dashboard/src/components/tables/large/row/template.html index 831ac5682..2d65260c8 100644 --- a/pgml-dashboard/src/components/tables/large/row/template.html +++ b/pgml-dashboard/src/components/tables/large/row/template.html @@ -7,11 +7,7 @@ > <% for column in columns { %> -
-
- <%+ column %> -
-
+ <%+ column %> <% } %> diff --git a/pgml-dashboard/src/components/tables/large/table/table.scss b/pgml-dashboard/src/components/tables/large/table/table.scss index 199af3beb..9873b32cd 100644 --- a/pgml-dashboard/src/components/tables/large/table/table.scss +++ b/pgml-dashboard/src/components/tables/large/table/table.scss @@ -1,8 +1,11 @@ table.table.table-lg { - td, tr { + td, tr, th { border-width: 0; } + border-collapse: separate; + border-spacing: 0 16px; + thead { th { color: #{$slate-shade-100}; @@ -16,4 +19,34 @@ table.table.table-lg { } } } + + tbody { + tr { + &:hover, &.active { + background: #{$gray-800}; + } + + td { + background: #{$gray-600}; + vertical-align: middle; + padding: 20px 0; + + &:first-of-type { + padding-left: 67px; + } + } + } + } + + &.selectable { + tbody { + tr:hover { + cursor: pointer; + } + } + } + + .table-cell-content { + height: 100%; + } } From 73f5fd97a66c9027b32980bc9b5d36d257d88f30 Mon Sep 17 00:00:00 2001 From: Lev Kokotov Date: Thu, 7 Sep 2023 14:37:03 -0700 Subject: [PATCH 5/5] td --- pgml-dashboard/src/components/tables/large/table/table.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pgml-dashboard/src/components/tables/large/table/table.scss b/pgml-dashboard/src/components/tables/large/table/table.scss index 9873b32cd..7ce84f130 100644 --- a/pgml-dashboard/src/components/tables/large/table/table.scss +++ b/pgml-dashboard/src/components/tables/large/table/table.scss @@ -23,7 +23,9 @@ table.table.table-lg { tbody { tr { &:hover, &.active { - background: #{$gray-800}; + td { + background: #{$gray-800}; + } } td {