From 9d1afd9c63867176b6023b842bf4cf6b4360d7c9 Mon Sep 17 00:00:00 2001 From: James Nestor <87858909+NotNestor@users.noreply.github.com> Date: Fri, 20 Dec 2024 08:51:15 +0000 Subject: [PATCH] chore: mdv2 table color tokens (#1854) --- .../src/wc_scss/themes/global--dark.scss | 1 + .../src/wc_scss/themes/global--light.scss | 1 + .../src/wc_scss/themes/global--mdv2.scss | 18 ++++++++++-------- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/web-components/src/wc_scss/themes/global--dark.scss b/web-components/src/wc_scss/themes/global--dark.scss index 1decfba70..0b4bfe0f4 100644 --- a/web-components/src/wc_scss/themes/global--dark.scss +++ b/web-components/src/wc_scss/themes/global--dark.scss @@ -111,6 +111,7 @@ --md-table-primary-bg-color: #{$md-gray-80}; --md-table-header-bg-color: #{$md-gray-95}; + --md-table-header-text-color: var(--md-secondary-text-color); --md-table-header-border-bottom: none; --md-table-cell-border-bottom: 1px solid #{$mds-color-theme-outline-secondary-normal}; --md-table-border-style: solid; diff --git a/web-components/src/wc_scss/themes/global--light.scss b/web-components/src/wc_scss/themes/global--light.scss index 5374ca3c0..0fd62ae60 100644 --- a/web-components/src/wc_scss/themes/global--light.scss +++ b/web-components/src/wc_scss/themes/global--light.scss @@ -111,6 +111,7 @@ --md-table-primary-bg-color: #{$md-gray-20}; --md-table-header-bg-color: #{$md-gray-05}; + --md-table-header-text-color: var(--md-secondary-text-color); --md-table-header-border-bottom: none; --md-table-cell-border-bottom: 1px solid #{$mds-color-theme-outline-secondary-normal}; --md-table-border-style: solid; diff --git a/web-components/src/wc_scss/themes/global--mdv2.scss b/web-components/src/wc_scss/themes/global--mdv2.scss index 660f939e3..897cc9237 100644 --- a/web-components/src/wc_scss/themes/global--mdv2.scss +++ b/web-components/src/wc_scss/themes/global--mdv2.scss @@ -143,14 +143,16 @@ $inter-medium-font: "Inter Medium", $font-family-sans-serif; * Temporarily disable overriding table background colours for mdv2 * **/ - // --md-table-primary-bg-color: #{$mds-color-theme-background-primary-ghost}; - // --md-table-header-bg-color: #{$mds-color-theme-background-primary-ghost}; - // --md-table-header-border-bottom: 0 -1px 0 0 #{$mds-color-theme-outline-primary-normal} inset; - // --md-table-cell-border-bottom: 1px solid #{$mds-color-theme-outline-secondary-normal}; - // --md-table-border-style: none; - // --md-table-sub-nav-bg-color: #{$mds-color-theme-background-primary-hover}; - // --md-table-vertical-divider-color: #{$mds-color-theme-outline-secondary-normal}; - // --md-table-pinned-border-color: #{$mds-color-theme-outline-share-inactive}; + --md-table-primary-bg-color: #{$mds-color-theme-background-primary-ghost}; + --md-table-header-bg-color: #{$mds-color-theme-background-primary-ghost}; + --md-table-header-text-color: #{$mds-color-theme-text-primary-normal}; + --md-table-header-border-bottom: 0 -1px 0 0 #{$mds-color-theme-outline-primary-normal} inset; + --md-table-cell-border-bottom: 1px solid #{$mds-color-theme-outline-secondary-normal}; + --md-table-border-style: none; + --md-table-sub-nav-bg-color: #{$mds-color-theme-background-primary-hover}; + --md-table-vertical-divider-color: #{$mds-color-theme-outline-secondary-normal}; + --md-table-pinned-border-color: #{$mds-color-theme-outline-share-inactive}; + // Background colors can not be overwritten because they are being used by consumers in unexpected ways // New background colors should be introduced and these phased out