From f64379963f272394afeb0ab1dad852f658abf2a1 Mon Sep 17 00:00:00 2001 From: didimmova Date: Wed, 27 May 2026 11:42:10 +0300 Subject: [PATCH 1/2] fix(grid): update grid theme to work better for header background changes --- .../sass/themes/components/grid/_grid-theme.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/theming/sass/themes/components/grid/_grid-theme.scss b/packages/theming/sass/themes/components/grid/_grid-theme.scss index 057b98d9..9cea2d67 100644 --- a/packages/theming/sass/themes/components/grid/_grid-theme.scss +++ b/packages/theming/sass/themes/components/grid/_grid-theme.scss @@ -277,10 +277,14 @@ $header-selected-background: dynamic-shade(var(--header-background)); } - @if not($header-selected-text-color) and $header-selected-background { + @if not($header-selected-text-color) and $header-selected-background and not($header-text-color) { $header-selected-text-color: adaptive-contrast(var(--header-selected-background)); } + @if not($header-selected-text-color) and $header-text-color { + $header-selected-text-color: var(--header-text-color); + } + @if not($header-border-color) and $header-background { $header-border-color: hsl(from adaptive-contrast(var(--header-background)) h s l / 0.24); } @@ -465,10 +469,6 @@ $filtering-header-text-color: adaptive-contrast(var(--filtering-header-background)); } - @if not($filtering-row-background) and $header-background { - $filtering-row-background: color-mix(in hsl, var(--header-background), #fff 5%); - } - @if not($filtering-row-text-color) and $filtering-row-background { $filtering-row-text-color: adaptive-contrast(var(--filtering-row-background)); } From f0ee6552e260fa8abbe51b84f30c5f303366de9d Mon Sep 17 00:00:00 2001 From: didimmova Date: Fri, 29 May 2026 09:16:55 +0300 Subject: [PATCH 2/2] fix(grid): reorder header-selected-text-color conditions --- .../theming/sass/themes/components/grid/_grid-theme.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/theming/sass/themes/components/grid/_grid-theme.scss b/packages/theming/sass/themes/components/grid/_grid-theme.scss index 9cea2d67..88fef74e 100644 --- a/packages/theming/sass/themes/components/grid/_grid-theme.scss +++ b/packages/theming/sass/themes/components/grid/_grid-theme.scss @@ -269,6 +269,10 @@ $ghost-header-text-color: adaptive-contrast(var(--ghost-header-background)); } + @if not($header-selected-text-color) and $header-selected-background and not($header-text-color) { + $header-selected-text-color: adaptive-contrast(var(--header-selected-background)); + } + @if not($header-text-color) and $header-background { $header-text-color: adaptive-contrast(var(--header-background)); } @@ -277,10 +281,6 @@ $header-selected-background: dynamic-shade(var(--header-background)); } - @if not($header-selected-text-color) and $header-selected-background and not($header-text-color) { - $header-selected-text-color: adaptive-contrast(var(--header-selected-background)); - } - @if not($header-selected-text-color) and $header-text-color { $header-selected-text-color: var(--header-text-color); }