From ce9d338c56a060de6fa3b63c9995e87dd162ee73 Mon Sep 17 00:00:00 2001 From: Emil Petrov Date: Wed, 26 Apr 2023 18:09:35 +0300 Subject: [PATCH] fix(grid): fix sticky row selection --- packages/bootstrap/scss/grid/_theme.scss | 20 ++++++++++---------- packages/classic/scss/grid/_variables.scss | 6 +++--- packages/default/scss/grid/_theme.scss | 16 ++++++++-------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/bootstrap/scss/grid/_theme.scss b/packages/bootstrap/scss/grid/_theme.scss index afe76c18e9..4e1982502c 100644 --- 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 index a02592519d..10c6a6ee26 100644 --- 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 index 5392f52e0b..5fc3a2e33b 100644 --- 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,