fix(grid): fix sticky row selection

telerik · May 4, 2023 · ce9d338 · ce9d338
1 parent 11dcd18
commit ce9d338
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/packages/bootstrap/scss/grid/_theme.scss b/packages/bootstrap/scss/grid/_theme.scss
@@ -210,15 +210,15 @@
         }
 
         // Selected state
-        &.k-selected .k-grid-content-sticky,
-        &.k-selected .k-grid-row-sticky,
-        td.k-grid-content-sticky.k-selected,
-        .k-table-td.k-grid-content-sticky.k-selected {
+        &.k-table-row.k-selected td.k-grid-content-sticky,
+        &.k-table-row.k-selected .k-table-td.k-grid-row-sticky,
+        &.k-table-row td.k-grid-content-sticky.k-selected,
+        &.k-table-row .k-table-td.k-grid-content-sticky.k-selected {
             @include fill( $bg: $kendo-grid-sticky-selected-bg );
         }
 
-        &.k-selected.k-table-alt-row .k-grid-content-sticky,
-        &.k-selected.k-table-alt-row .k-grid-row-sticky,
+        &.k-selected.k-table-alt-row td.k-grid-content-sticky,
+        &.k-selected.k-table-alt-row .k-table-td.k-grid-row-sticky,
         &.k-table-alt-row td.k-grid-content-sticky.k-selected,
         &.k-table-alt-row .k-table-td.k-grid-content-sticky.k-selected {
             @include fill( $bg: $kendo-grid-sticky-selected-alt-bg );
@@ -235,10 +235,10 @@
 
 
         // Selected hover
-        &.k-selected:hover .k-grid-content-sticky,
-        &.k-selected.k-hover .k-grid-content-sticky,
-        &.k-selected:hover .k-grid-row-sticky,
-        &.k-selected.k-hover .k-grid-row-sticky,
+        &.k-selected:hover td.k-grid-content-sticky,
+        &.k-selected.k-hover .k-table-td.k-grid-content-sticky,
+        &.k-selected:hover td.k-grid-row-sticky,
+        &.k-selected.k-hover .k-table-td.k-grid-row-sticky,
         &:hover td.k-grid-content-sticky.k-selected,
         &.k-hover td.k-grid-content-sticky.k-selected,
         &:hover .k-table-td.k-grid-content-sticky.k-selected,

diff --git a/packages/classic/scss/grid/_variables.scss b/packages/classic/scss/grid/_variables.scss
@@ -258,11 +258,11 @@ $kendo-grid-sticky-header-border: $kendo-grid-sticky-border !default;
 $kendo-grid-sticky-footer-bg: $kendo-grid-header-bg !default;
 $kendo-grid-sticky-footer-hover-bg: $kendo-grid-hover-bg !default;
 
-$kendo-grid-sticky-selected-bg: $kendo-grid-selected-bg !default;
-$kendo-grid-sticky-selected-alt-bg: k-try-shade( $kendo-grid-selected-bg, .5 ) !default;
+$kendo-grid-sticky-selected-bg: k-color-mix($kendo-selected-bg, #ffffff, 25%) !default;
+$kendo-grid-sticky-selected-alt-bg: k-try-shade( $kendo-grid-sticky-selected-bg, .5 ) !default;
 
 $kendo-grid-sticky-hover-bg: $kendo-grid-hover-bg !default;
-$kendo-grid-sticky-selected-hover-bg: k-try-shade( $kendo-grid-selected-bg, 1 ) !default;
+$kendo-grid-sticky-selected-hover-bg: k-try-shade( $kendo-grid-sticky-selected-bg, 1 ) !default;
 
 $kendo-grid-column-menu-width: 230px !default;
 

diff --git a/packages/default/scss/grid/_theme.scss b/packages/default/scss/grid/_theme.scss
@@ -269,15 +269,15 @@
         }
 
         // Selected state
-        &.k-table-row.k-selected .k-grid-content-sticky,
-        &.k-table-row.k-selected .k-grid-row-sticky,
+        &.k-table-row.k-selected td.k-grid-content-sticky,
+        &.k-table-row.k-selected .k-table-td.k-grid-row-sticky,
         &.k-table-row td.k-grid-content-sticky.k-selected,
         &.k-table-row .k-table-td.k-grid-content-sticky.k-selected {
             @include fill( $bg: $kendo-grid-sticky-selected-bg );
         }
 
-        &.k-selected.k-table-alt-row .k-grid-content-sticky,
-        &.k-selected.k-table-alt-row .k-grid-row-sticky,
+        &.k-selected.k-table-alt-row td.k-grid-content-sticky,
+        &.k-selected.k-table-alt-row .k-table-td.k-grid-row-sticky,
         &.k-table-alt-row td.k-grid-content-sticky.k-selected,
         &.k-table-alt-row .k-table-td.k-grid-content-sticky.k-selected {
             @include fill( $bg: $kendo-grid-sticky-selected-alt-bg );
@@ -294,10 +294,10 @@
 
 
         // Selected hover
-        &.k-selected:hover .k-grid-content-sticky,
-        &.k-selected:hover .k-grid-row-sticky,
-        &.k-selected.k-hover .k-grid-content-sticky,
-        &.k-selected.k-hover .k-grid-row-sticky,
+        &.k-selected:hover td.k-grid-content-sticky,
+        &.k-selected:hover .k-table-td.k-grid-row-sticky,
+        &.k-selected.k-hover td.k-grid-content-sticky,
+        &.k-selected.k-hover .k-table-td.k-grid-row-sticky,
         &:hover td.k-grid-content-sticky.k-selected,
         &.k-hover td.k-grid-content-sticky.k-selected,
         &:hover .k-table-td.k-grid-content-sticky.k-selected,