diff --git a/assets/styles/themes/_dark.scss b/assets/styles/themes/_dark.scss index 65e89d02e4..981b5184d5 100644 --- a/assets/styles/themes/_dark.scss +++ b/assets/styles/themes/_dark.scss @@ -114,9 +114,9 @@ --progress-bg : #{$medium}; --progress-divider : #{$lightest}; + --sortable-table-bg : #{lighten($darkest, 10%)}; + --sortable-table-row-bg : #{$darker};; --sortable-table-header-bg : #{$darkest}; - --sortable-table-accent-bg : #{$darker}; - --sortable-table-accent-alt : #{$dark}; --sortable-table-top-divider : var(--border); --sortable-table-hover-bg : #{$darkest}; --sortable-table-selected-bg : var(--primary-light-bg); diff --git a/assets/styles/themes/_light.scss b/assets/styles/themes/_light.scss index 4a59e52faf..7d901e8749 100644 --- a/assets/styles/themes/_light.scss +++ b/assets/styles/themes/_light.scss @@ -384,10 +384,9 @@ BODY, .theme-light { --progress-bg : #{$medium}; --progress-divider : #{$medium}; - --sortable-table-bg : transparent; - --sortable-table-header-bg : transparent; - --sortable-table-accent-bg : #{$lighter}; - --sortable-table-accent-alt : #{$lightest}; + --sortable-table-bg : #{darken($lightest, 5%)}; + --sortable-table-row-bg : #{$lightest}; + --sortable-table-header-bg : #{$lighter}; --sortable-table-top-divider : var(--border); --sortable-table-body-divider : #{$medium}; diff --git a/components/SortableTable/index.vue b/components/SortableTable/index.vue index 672f0c5f7c..5a104f9f54 100644 --- a/components/SortableTable/index.vue +++ b/components/SortableTable/index.vue @@ -766,7 +766,7 @@ $spacing: 10px; border-radius: 5px 5px 0 0; outline: 1px solid var(--border); overflow: hidden; - background: var(--sortable-table-accent-bg); + background: var(--sortable-table-bg); border-radius: 4px; td { @@ -781,7 +781,7 @@ $spacing: 10px; tbody { tr { border-bottom: 1px solid var(--sortable-table-top-divider); - background-color: var(--body-bg); + background-color: var(--sortable-table-row-bg); &.main-row.has-sub-row { border-bottom: 0; @@ -808,12 +808,12 @@ $spacing: 10px; td { &:first-of-type { - border-left: 1px solid var(--sortable-table-accent-bg); + // border-left: 1px solid var(--sortable-table-accent-bg); } &:last-of-type { /* Not sure why 2 but one doesn't show up.. */ - border-right: 2px solid var(--sortable-table-accent-bg); + // border-right: 2px solid var(--sortable-table-accent-bg); } } @@ -851,7 +851,7 @@ $spacing: 10px; background-color: initial; &:first-child { - border-bottom: 0; + border-bottom: 2px solid var(--sortable-table-row-bg); } &:not(:first-child) { @@ -872,9 +872,9 @@ $spacing: 10px; line-height: $group-row-height; padding: 0 10px; border-radius: 4px 4px 0px 0px; - background-color: var(--body-bg); + background-color: var(--sortable-table-row-bg); position: relative; - top: 0; + top: 1px; display: inline-block; z-index: z-index('tableGroup'); min-width: $group-row-height * 1.8; @@ -888,7 +888,7 @@ $spacing: 10px; height: $group-row-height; width: 70px; border-radius: 5px 5px 0px 0px; - background-color: var(--body-bg); + background-color: var(--sortable-table-row-bg); content: ""; position: absolute; right: -15px;