fix(grid): add locked column selected, hovered and selected hovered s…

…tates variables
telerik · Nov 8, 2019 · fa99539 · fa99539
1 parent 89ee7a0
commit fa99539
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/packages/bootstrap/scss/_variables.scss b/packages/bootstrap/scss/_variables.scss
@@ -924,11 +924,11 @@ $grid-sticky-text: $grid-header-text !default;
 $grid-sticky-bg: $grid-header-bg !default;
 $grid-sticky-border: $grid-header-border !default;
 
-$grid-sticky-selected-bg: #bfdeff !default;
-$grid-sticky-selected-alt-bg: #bad9fa !default;
+$grid-sticky-selected-bg: mix( $grid-bg, $selected-bg, 75% ) !default;
+$grid-sticky-selected-alt-bg:  mix( mix( $grid-bg, contrast-wcag( $grid-bg ), 97% ), $selected-bg, 75% ) !default;
 
 $grid-sticky-hovered-bg: $hovered-bg !default;
-$grid-sticky-selected-hovered-bg: #b4d3f5 !default;
+$grid-sticky-selected-hovered-bg: mix( mix( $grid-bg, contrast-wcag( $grid-bg ), 93.5% ), $selected-bg, 75% ) !default;
 
 
 // Treeview

diff --git a/packages/default/scss/_variables.scss b/packages/default/scss/_variables.scss
@@ -898,15 +898,15 @@ $grid-command-cell-button-spacing: .16em !default;
 
 $grid-search-width: 15.7em !default;
 
-$grid-sticky-text: $grid-header-text !default;
 $grid-sticky-bg: $grid-header-bg !default;
+$grid-sticky-text: $grid-header-text !default;
 $grid-sticky-border: $grid-header-border !default;
 
-$grid-sticky-selected-bg: #ffd8d5 !default;
-$grid-sticky-selected-alt-bg: #f8d1ce !default;
+$grid-sticky-selected-bg: mix( $grid-bg, $selected-bg, 75% ) !default;
+$grid-sticky-selected-alt-bg: mix( mix( $grid-bg, contrast-wcag( $grid-bg ), 96% ), $selected-bg, 75% ) !default;
 
 $grid-sticky-hovered-bg: $hovered-bg !default;
-$grid-sticky-selected-hovered-bg: #f2cbc8 !default;
+$grid-sticky-selected-hovered-bg: mix( $grid-hovered-bg, $selected-bg, 75% ) !default;
 
 
 // Treeview

diff --git a/packages/material/scss/_variables.scss b/packages/material/scss/_variables.scss
@@ -990,11 +990,11 @@ $grid-sticky-text: $grid-text !default;
 $grid-sticky-bg: $grid-bg !default;
 $grid-sticky-border: $grid-header-border !default;
 
-$grid-sticky-selected-bg: #f5f5f5 !default;
-$grid-sticky-selected-alt-bg: null !default;
+$grid-sticky-selected-bg: mix( $grid-bg, contrast-wcag( $grid-bg ), 96% ) !default;
+$grid-sticky-selected-alt-bg: mix( $grid-bg, contrast-wcag( $grid-bg ), 96% ) !default;
 
-$grid-sticky-hovered-bg: #ededed !default;
-$grid-sticky-selected-hovered-bg: #ededed !default;
+$grid-sticky-hovered-bg: mix( mix( $grid-bg, contrast-wcag( $grid-bg ), 90% ), $grid-bg, 75% ) !default;
+$grid-sticky-selected-hovered-bg: mix( mix( $grid-bg, contrast-wcag( $grid-bg ), 93% ), mix( $grid-bg, contrast-wcag( $grid-bg ), 96% ), 75% ) !default;
 
 
 // Treeview