From c1bf80ed19e21dc3dd991ec30a1480de078d9e5f Mon Sep 17 00:00:00 2001
From: Ivo Valkov <ivalkov@progress.com>
Date: Fri, 2 Aug 2024 16:19:32 +0300
Subject: [PATCH] fix(grid): missing sticky rows styles

---
 packages/bootstrap/scss/grid/_theme.scss | 124 ++--------------------
 packages/default/scss/grid/_layout.scss  |   3 +-
 packages/default/scss/grid/_theme.scss   | 126 ++---------------------
 packages/fluent/scss/grid/_layout.scss   |   3 +-
 packages/fluent/scss/grid/_theme.scss    | 124 ++--------------------
 packages/material/scss/grid/_theme.scss  |  13 ---
 6 files changed, 31 insertions(+), 362 deletions(-)

diff --git a/packages/bootstrap/scss/grid/_theme.scss b/packages/bootstrap/scss/grid/_theme.scss
index cc9a6ccd370..32a23cc71ce 100644
--- a/packages/bootstrap/scss/grid/_theme.scss
+++ b/packages/bootstrap/scss/grid/_theme.scss
@@ -187,7 +187,7 @@
             border-top-color: $kendo-grid-border;
         }
 
-        .k-grid-row-sticky {
+        &.k-grid-row-sticky > .k-table-td {
             border-top-color: $kendo-grid-sticky-border;
             border-bottom-color: $kendo-grid-sticky-border;
             background-color: $kendo-grid-sticky-bg;
@@ -195,6 +195,7 @@
 
         &.k-table-alt-row {
             .k-grid-content-sticky,
+            &.k-grid-row-sticky > .k-table-td,
             .k-grid-row-sticky {
                 @include fill( $bg: $kendo-grid-sticky-alt-bg );
             }
@@ -202,6 +203,7 @@
 
         // Selected state
         &.k-table-row.k-selected td.k-grid-content-sticky,
+        &.k-table-row.k-selected.k-grid-row-sticky > .k-table-td,
         &.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 {
@@ -217,6 +219,7 @@
         }
 
         &.k-selected.k-table-alt-row td.k-grid-content-sticky,
+        &.k-selected.k-table-alt-row.k-grid-row-sticky > .k-table-td,
         &.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 {
@@ -236,7 +239,9 @@
         &:hover .k-grid-content-sticky,
         &.k-hover .k-grid-content-sticky,
         &:hover .k-grid-row-sticky,
-        &.k-hover .k-grid-row-sticky {
+        &.k-hover .k-grid-row-sticky,
+        &:hover.k-grid-row-sticky > .k-table-td,
+        &.k-hover.k-grid-row-sticky > .k-table-td {
             background-color: $kendo-grid-sticky-hover-bg;
         }
 
@@ -246,6 +251,8 @@
         &.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,
+        &.k-selected:hover.k-grid-row-sticky > .k-table-td,
+        &.k-selected.k-hover.k-grid-row-sticky > .k-table-td,
         &: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,
@@ -262,119 +269,6 @@
         }
     }
 
-    kendo-grid.k-grid {
-        .k-grid-content-sticky {
-            border-top-color: $kendo-grid-border;
-            border-left-color: $kendo-grid-sticky-border;
-            border-right-color: $kendo-grid-sticky-border;
-            background-color: $kendo-grid-sticky-bg;
-
-            &:hover,
-            &.k-hover {
-                background-color: $kendo-grid-sticky-hover-bg;
-            }
-        }
-
-        .k-grid-row-sticky td,
-        .k-grid-row-sticky .k-table-td {
-            border-top-color: $kendo-grid-sticky-border;
-            border-bottom-color: $kendo-grid-sticky-border;
-            background-color: $kendo-grid-sticky-bg;
-
-            &:hover td,
-            &.k-hover td,
-            &:hover .k-table-td,
-            &.k-hover .k-table-td {
-                background-color: $kendo-grid-sticky-hover-bg;
-            }
-        }
-
-        .k-table-alt-row .k-grid-content-sticky,
-        .k-grid-row-sticky.k-table-alt-row td,
-        .k-grid-row-sticky.k-table-alt-row .k-table-td {
-            @include fill( $bg: $kendo-grid-sticky-alt-bg );
-        }
-
-        // Selected state
-        .k-table-row.k-selected .k-grid-content-sticky,
-        .k-selected.k-grid-row-sticky td,
-        .k-grid-row-sticky td.k-selected,
-        .k-selected.k-grid-row-sticky .k-table-td,
-        .k-grid-row-sticky .k-table-td.k-selected,
-        .k-selected.k-grid-content-sticky {
-            @if($kendo-enable-color-system) {
-                @include fill( $bg: $kendo-grid-sticky-bg );
-
-                &::before {
-                    @include fill( $bg: $kendo-grid-sticky-selected-bg );
-                }
-            } @else {
-                @include fill( $bg: $kendo-grid-sticky-selected-bg );
-            }
-        }
-
-        .k-table-row.k-selected.k-table-alt-row .k-grid-content-sticky,
-        .k-selected.k-table-alt-row.k-grid-row-sticky td,
-        .k-selected.k-table-alt-row.k-grid-row-sticky .k-table-td,
-        .k-table-alt-row .k-selected.k-grid-content-sticky {
-            @if($kendo-enable-color-system) {
-                @include fill( $bg: $kendo-grid-sticky-alt-bg );
-
-                &::before {
-                    @include fill( $bg: $kendo-grid-sticky-selected-alt-bg );
-                }
-            } @else {
-                @include fill( $bg: $kendo-grid-sticky-selected-alt-bg );
-            }
-        }
-
-        // Hover state
-        .k-table-row:hover .k-grid-content-sticky,
-        .k-table-row.k-hover .k-grid-content-sticky,
-        .k-grid-row-sticky:hover td,
-        .k-grid-row-sticky.k-hover td,
-        .k-grid-row-sticky.k-table-alt-row:hover td,
-        .k-grid-row-sticky.k-table-alt-row.k-hover td,
-        .k-grid-row-sticky:hover .k-table-td,
-        .k-grid-row-sticky.k-hover .k-table-td,
-        .k-grid-row-sticky.k-table-alt-row:hover .k-table-td,
-        .k-grid-row-sticky.k-table-alt-row.k-hover .k-table-td,
-        .k-table-alt-row:hover .k-grid-content-sticky,
-        .k-table-alt-row.k-hover .k-grid-content-sticky {
-            background-color: $kendo-grid-sticky-hover-bg;
-        }
-
-        // Selected + Hover
-        .k-table-row.k-selected:hover .k-grid-content-sticky,
-        .k-table-row.k-selected.k-hover .k-grid-content-sticky,
-        .k-selected.k-grid-row-sticky:hover td,
-        .k-selected.k-grid-row-sticky.k-hover td,
-        .k-selected.k-table-alt-row.k-grid-row-sticky:hover td,
-        .k-selected.k-table-alt-row.k-grid-row-sticky.k-hover td,
-        .k-selected.k-grid-row-sticky:hover .k-table-td,
-        .k-selected.k-grid-row-sticky.k-hover .k-table-td,
-        .k-selected.k-table-alt-row.k-grid-row-sticky:hover .k-table-td,
-        .k-selected.k-table-alt-row.k-grid-row-sticky.k-hover .k-table-td,
-        .k-table-row.k-selected.k-table-alt-row:hover .k-grid-content-sticky,
-        .k-table-row.k-selected.k-table-alt-row.k-hover .k-grid-content-sticky,
-        .k-grid-row-sticky:hover td.k-selected,
-        .k-grid-row-sticky.k-hover td.k-selected,
-        .k-grid-row-sticky:hover .k-table-td.k-selected,
-        .k-grid-row-sticky.k-hover .k-table-td.k-selected,
-        .k-table-row:hover .k-grid-content-sticky.k-selected,
-        .k-table-row.k-hover .k-grid-content-sticky.k-selected {
-            @if($kendo-enable-color-system) {
-                background-color: $kendo-grid-sticky-hover-bg;
-
-                &::before {
-                    background-color: $kendo-grid-sticky-selected-hover-bg;
-                }
-            } @else {
-                background-color: $kendo-grid-sticky-selected-hover-bg;
-            }
-        }
-    }
-
     .k-grouping-row {
         .k-grid-content-sticky {
             @include fill( $bg: $kendo-grid-sticky-header-bg );
diff --git a/packages/default/scss/grid/_layout.scss b/packages/default/scss/grid/_layout.scss
index 88cd2486442..52ff7695050 100644
--- a/packages/default/scss/grid/_layout.scss
+++ b/packages/default/scss/grid/_layout.scss
@@ -778,7 +778,8 @@
         }
     }
 
-    .k-master-row .k-grid-content-sticky::before {
+    .k-master-row .k-grid-content-sticky::before,
+    .k-master-row.k-grid-row-sticky .k-table-td::before {
         content: "";
         width: 100%;
         height: 100%;
diff --git a/packages/default/scss/grid/_theme.scss b/packages/default/scss/grid/_theme.scss
index 2140ac1e46a..7eff1c637fe 100644
--- a/packages/default/scss/grid/_theme.scss
+++ b/packages/default/scss/grid/_theme.scss
@@ -252,7 +252,7 @@
             background-color: $kendo-grid-sticky-bg;
         }
 
-        .k-grid-row-sticky {
+        &.k-grid-row-sticky > .k-table-td {
             border-top-color: $kendo-grid-sticky-border;
             border-bottom-color: $kendo-grid-sticky-border;
             background-color: $kendo-grid-sticky-bg;
@@ -260,6 +260,7 @@
 
         &.k-table-alt-row {
             .k-grid-content-sticky,
+            &.k-grid-row-sticky > .k-table-td,
             .k-grid-row-sticky {
                 @include fill( $bg: $kendo-grid-sticky-alt-bg );
             }
@@ -267,6 +268,7 @@
 
         // Selected state
         &.k-table-row.k-selected td.k-grid-content-sticky,
+        &.k-table-row.k-selected.k-grid-row-sticky > .k-table-td,
         &.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 {
@@ -282,6 +284,7 @@
         }
 
         &.k-selected.k-table-alt-row td.k-grid-content-sticky,
+        &.k-selected.k-table-alt-row.k-grid-row-sticky > .k-table-td,
         &.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 {
@@ -300,8 +303,10 @@
         // Hovered state
         &:hover .k-grid-content-sticky,
         &:hover .k-grid-row-sticky,
+        &:hover.k-grid-row-sticky > .k-table-td,
         &.k-hover .k-grid-content-sticky,
-        &.k-hover .k-grid-row-sticky {
+        &.k-hover .k-grid-row-sticky,
+        &.k-hover.k-grid-row-sticky > .k-table-td {
             background-color: $kendo-grid-sticky-hover-bg;
         }
 
@@ -309,8 +314,10 @@
         // Selected hover
         &.k-selected:hover td.k-grid-content-sticky,
         &.k-selected:hover .k-table-td.k-grid-row-sticky,
+        &.k-selected:hover.k-grid-row-sticky > .k-table-td,
         &.k-selected.k-hover td.k-grid-content-sticky,
         &.k-selected.k-hover .k-table-td.k-grid-row-sticky,
+        &.k-selected.k-hover.k-grid-row-sticky > .k-table-td,
         &: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,
@@ -327,121 +334,6 @@
         }
     }
 
-    kendo-grid.k-grid {
-        .k-grid-content-sticky {
-            border-top-color: $kendo-grid-header-border;
-            border-left-color: $kendo-grid-sticky-border;
-            border-right-color: $kendo-grid-sticky-border;
-            background-color: $kendo-grid-sticky-bg;
-
-            &:hover,
-            &.k-hover {
-                background-color: $kendo-grid-sticky-hover-bg;
-            }
-        }
-
-        .k-grid-row-sticky {
-            td,
-            .k-table-td {
-                border-top-color: $kendo-grid-sticky-border;
-                border-bottom-color: $kendo-grid-sticky-border;
-                background-color: $kendo-grid-sticky-bg;
-            }
-
-            &:hover td,
-            &.k-hover td,
-            &:hover .k-table-td,
-            &.k-hover .k-table-td {
-                background-color: $kendo-grid-sticky-hover-bg;
-            }
-        }
-
-        .k-table-alt-row .k-grid-content-sticky,
-        .k-grid-row-sticky.k-table-alt-row td,
-        .k-grid-row-sticky.k-table-alt-row .k-table-td {
-            @include fill( $bg: $kendo-grid-sticky-alt-bg );
-        }
-
-        // Selected state
-        .k-table-row.k-selected .k-grid-content-sticky,
-        .k-selected.k-grid-row-sticky td,
-        .k-grid-row-sticky td.k-selected,
-        .k-selected.k-grid-row-sticky .k-table-td,
-        .k-grid-row-sticky .k-table-td.k-selected,
-        .k-selected.k-grid-content-sticky {
-            @if($kendo-enable-color-system) {
-                @include fill( $bg: $kendo-grid-sticky-bg );
-
-                &::before {
-                    @include fill( $bg: $kendo-grid-sticky-selected-bg );
-                }
-            } @else {
-                @include fill( $bg: $kendo-grid-sticky-selected-bg );
-            }
-        }
-
-        .k-table-row.k-selected.k-table-alt-row .k-grid-content-sticky,
-        .k-selected.k-table-alt-row.k-grid-row-sticky td,
-        .k-selected.k-table-alt-row.k-grid-row-sticky .k-table-td,
-        .k-table-alt-row .k-selected.k-grid-content-sticky {
-            @if($kendo-enable-color-system) {
-                @include fill( $bg: $kendo-grid-sticky-alt-bg );
-
-                &::before {
-                    @include fill( $bg: $kendo-grid-sticky-selected-alt-bg );
-                }
-            } @else {
-                @include fill( $bg: $kendo-grid-sticky-selected-alt-bg );
-            }
-        }
-
-        // Hover state
-        .k-table-row:hover .k-grid-content-sticky,
-        .k-table-row.k-hover .k-grid-content-sticky,
-        .k-grid-row-sticky:hover td,
-        .k-grid-row-sticky.k-hover td,
-        .k-grid-row-sticky.k-table-alt-row:hover td,
-        .k-grid-row-sticky.k-table-alt-row.k-hover td,
-        .k-grid-row-sticky:hover .k-table-td,
-        .k-grid-row-sticky.k-hover .k-table-td,
-        .k-grid-row-sticky.k-table-alt-row:hover .k-table-td,
-        .k-grid-row-sticky.k-table-alt-row.k-hover .k-table-td,
-        .k-table-alt-row:hover .k-grid-content-sticky,
-        .k-table-alt-row.k-hover .k-grid-content-sticky {
-            background-color: $kendo-grid-sticky-hover-bg;
-        }
-
-        // Selected + Hover
-        .k-table-row.k-selected:hover .k-grid-content-sticky,
-        .k-table-row.k-selected.k-hover .k-grid-content-sticky,
-        .k-selected.k-grid-row-sticky:hover td,
-        .k-selected.k-grid-row-sticky.k-hover td,
-        .k-selected.k-table-alt-row.k-grid-row-sticky:hover td,
-        .k-selected.k-table-alt-row.k-grid-row-sticky.k-hover td,
-        .k-selected.k-grid-row-sticky:hover .k-table-td,
-        .k-selected.k-grid-row-sticky.k-hover .k-table-td,
-        .k-selected.k-table-alt-row.k-grid-row-sticky:hover .k-table-td,
-        .k-selected.k-table-alt-row.k-grid-row-sticky.k-hover .k-table-td,
-        .k-table-row.k-selected.k-table-alt-row:hover .k-grid-content-sticky,
-        .k-table-row.k-selected.k-table-alt-row.k-hover .k-grid-content-sticky,
-        .k-grid-row-sticky:hover td.k-selected,
-        .k-grid-row-sticky.k-hover td.k-selected,
-        .k-grid-row-sticky:hover .k-table-td.k-selected,
-        .k-grid-row-sticky.k-hover .k-table-td.k-selected,
-        .k-table-row:hover .k-grid-content-sticky.k-selected,
-        .k-table-row.k-hover .k-grid-content-sticky.k-selected {
-            @if($kendo-enable-color-system) {
-                background-color: $kendo-grid-sticky-hover-bg;
-
-                &::before {
-                    background-color: $kendo-grid-sticky-selected-hover-bg;
-                }
-            } @else {
-                background-color: $kendo-grid-sticky-selected-hover-bg;
-            }
-        }
-    }
-
     .k-grouping-row {
         .k-grid-content-sticky {
             @include fill( $bg: $kendo-grid-sticky-header-bg );
diff --git a/packages/fluent/scss/grid/_layout.scss b/packages/fluent/scss/grid/_layout.scss
index 2cd21884505..9ecddd85997 100644
--- a/packages/fluent/scss/grid/_layout.scss
+++ b/packages/fluent/scss/grid/_layout.scss
@@ -812,7 +812,8 @@
         }
     }
 
-    .k-master-row .k-grid-content-sticky::before {
+    .k-master-row .k-grid-content-sticky::before,
+    .k-master-row.k-grid-row-sticky .k-table-td::before {
         content: "";
         width: 100%;
         height: 100%;
diff --git a/packages/fluent/scss/grid/_theme.scss b/packages/fluent/scss/grid/_theme.scss
index bfc2cbaf6e0..5614db2dd73 100644
--- a/packages/fluent/scss/grid/_theme.scss
+++ b/packages/fluent/scss/grid/_theme.scss
@@ -292,13 +292,14 @@
             background-color: var( --kendo-grid-sticky-bg, #{$kendo-grid-sticky-bg} );
         }
 
-        .k-grid-row-sticky {
+        &.k-grid-row-sticky > .k-table-td {
             border-block-color: var( --kendo-grid-sticky-border, #{$kendo-grid-sticky-border} );
             background-color: var( --kendo-grid-sticky-bg, #{$kendo-grid-sticky-bg} );
         }
 
         &.k-table-alt-row {
             .k-grid-content-sticky,
+            &.k-grid-row-sticky > .k-table-td,
             .k-grid-row-sticky {
                 @include fill( $bg: var( --kendo-grid-sticky-alt-bg, #{$kendo-grid-sticky-alt-bg} ) );
             }
@@ -306,6 +307,7 @@
 
         // Selected state
         &.k-table-row.k-selected td.k-grid-content-sticky,
+        &.k-table-row.k-selected.k-grid-row-sticky > .k-table-td,
         &.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 {
@@ -321,6 +323,7 @@
         }
 
         &.k-selected.k-table-alt-row td.k-grid-content-sticky,
+        &.k-selected.k-table-alt-row.k-grid-row-sticky > .k-table-td,
         &.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 {
@@ -339,8 +342,10 @@
         // Hover
         &:hover .k-grid-content-sticky,
         &:hover .k-grid-row-sticky,
+        &:hover.k-grid-row-sticky > .k-table-td,
         &.k-hover .k-grid-content-sticky,
-        &.k-hover .k-grid-row-sticky {
+        &.k-hover .k-grid-row-sticky,
+        &.k-hover.k-grid-row-sticky > .k-table-td {
             @include fill( $bg: var( --kendo-grid-sticky-hover-bg, #{$kendo-grid-sticky-hover-bg} ) );
         }
 
@@ -348,8 +353,10 @@
         // Selected hover
         &.k-selected:hover td.k-grid-content-sticky,
         &.k-selected:hover .k-table-td.k-grid-row-sticky,
+        &.k-selected:hover.k-grid-row-sticky > .k-table-td,
         &.k-selected.k-hover td.k-grid-content-sticky,
         &.k-selected.k-hover .k-table-td.k-grid-row-sticky,
+        &.k-selected.k-hover.k-grid-row-sticky > .k-table-td,
         &: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,
@@ -366,119 +373,6 @@
         }
     }
 
-    kendo-grid.k-grid {
-        .k-grid-content-sticky {
-            border-top-color: var( --kendo-grid-header-border, #{$kendo-grid-header-border} );
-            border-inline-color: var( --kendo-grid-sticky-border, #{$kendo-grid-sticky-border} );
-            background-color: var( --kendo-grid-sticky-bg, #{$kendo-grid-sticky-bg} );
-
-            &:hover,
-            &.k-hover {
-                background-color: var( --kendo-grid-sticky-hover-bg, #{$kendo-grid-sticky-hover-bg} );
-            }
-        }
-
-        .k-grid-row-sticky {
-            td,
-            .k-table-td {
-                border-block-color: var( --kendo-grid-sticky-border, #{$kendo-grid-sticky-border} );
-                background-color: var( --kendo-grid-sticky-bg, #{$kendo-grid-sticky-bg} );
-            }
-
-            &:hover td,
-            &.k-hover td,
-            &:hover .k-table-td,
-            &.k-hover .k-table-td {
-                background-color: var( --kendo-grid-sticky-hover-bg, #{$kendo-grid-sticky-hover-bg} );
-            }
-        }
-
-        .k-table-alt-row .k-grid-content-sticky,
-        .k-grid-row-sticky.k-table-alt-row td,
-        .k-grid-row-sticky.k-table-alt-row .k-table-td {
-            @include fill( $bg: var( --kendo-grid-sticky-alt-bg, #{$kendo-grid-sticky-alt-bg} ) );
-        }
-
-        // Selected state
-        .k-table-row.k-selected .k-grid-content-sticky,
-        .k-selected.k-grid-row-sticky td,
-        .k-grid-row-sticky td.k-selected,
-        .k-selected.k-grid-row-sticky .k-table-td,
-        .k-grid-row-sticky .k-table-td.k-selected,
-        .k-selected.k-grid-content-sticky {
-            @if($kendo-enable-color-system) {
-                @include fill( $bg: var( --kendo-grid-sticky-bg, #{$kendo-grid-sticky-bg} ) );
-
-                &::before {
-                    @include fill( $bg: var( --kendo-grid-sticky-selected-bg, #{$kendo-grid-sticky-selected-bg} ) );
-                }
-            } @else {
-                @include fill( $bg: var( --kendo-grid-sticky-selected-bg, #{$kendo-grid-sticky-selected-bg} ) );
-            }
-        }
-
-        .k-table-row.k-selected.k-table-alt-row .k-grid-content-sticky,
-        .k-selected.k-table-alt-row.k-grid-row-sticky td,
-        .k-selected.k-table-alt-row.k-grid-row-sticky .k-table-td,
-        .k-table-alt-row .k-selected.k-grid-content-sticky {
-            @if($kendo-enable-color-system) {
-                @include fill( $bg: var( --kendo-grid-sticky-alt-bg, #{$kendo-grid-sticky-alt-bg} ) );
-
-                &::before {
-                    @include fill( $bg: var( --kendo-grid-sticky-selected-alt-bg, #{$kendo-grid-sticky-selected-alt-bg} ) );
-                }
-            } @else {
-                @include fill( $bg: var( --kendo-grid-sticky-selected-alt-bg, #{$kendo-grid-sticky-selected-alt-bg} ) );
-            }
-        }
-
-        // Hover state
-        .k-table-row:hover .k-grid-content-sticky,
-        .k-table-row.k-hover .k-grid-content-sticky,
-        .k-grid-row-sticky:hover td,
-        .k-grid-row-sticky.k-hover td,
-        .k-grid-row-sticky.k-table-alt-row:hover td,
-        .k-grid-row-sticky.k-table-alt-row.k-hover td,
-        .k-grid-row-sticky:hover .k-table-td,
-        .k-grid-row-sticky.k-hover .k-table-td,
-        .k-grid-row-sticky.k-table-alt-row:hover .k-table-td,
-        .k-grid-row-sticky.k-table-alt-row.k-hover .k-table-td,
-        .k-table-alt-row:hover .k-grid-content-sticky,
-        .k-table-alt-row.k-hover .k-grid-content-sticky {
-            @include fill( $bg: var( --kendo-grid-sticky-hover-bg, #{$kendo-grid-sticky-hover-bg} ) );
-        }
-
-        // Selected + Hover
-        .k-table-row.k-selected:hover .k-grid-content-sticky,
-        .k-table-row.k-selected.k-hover .k-grid-content-sticky,
-        .k-selected.k-grid-row-sticky:hover td,
-        .k-selected.k-grid-row-sticky.k-hover td,
-        .k-selected.k-table-alt-row.k-grid-row-sticky:hover td,
-        .k-selected.k-table-alt-row.k-grid-row-sticky.k-hover td,
-        .k-selected.k-grid-row-sticky:hover .k-table-td,
-        .k-selected.k-grid-row-sticky.k-hover .k-table-td,
-        .k-selected.k-table-alt-row.k-grid-row-sticky:hover .k-table-td,
-        .k-selected.k-table-alt-row.k-grid-row-sticky.k-hover .k-table-td,
-        .k-table-row.k-selected.k-table-alt-row:hover .k-grid-content-sticky,
-        .k-table-row.k-selected.k-table-alt-row.k-hover .k-grid-content-sticky,
-        .k-grid-row-sticky:hover td.k-selected,
-        .k-grid-row-sticky.k-hover td.k-selected,
-        .k-grid-row-sticky:hover .k-table-td.k-selected,
-        .k-grid-row-sticky.k-hover .k-table-td.k-selected,
-        .k-table-row:hover .k-grid-content-sticky.k-selected,
-        .k-table-row.k-hover .k-grid-content-sticky.k-selected {
-            @if($kendo-enable-color-system) {
-                background-color: var( --kendo-grid-sticky-hover-bg, #{$kendo-grid-sticky-hover-bg} );
-
-                &::before {
-                    @include fill( $bg: var( --kendo-grid-sticky-selected-hover-bg, #{$kendo-grid-sticky-selected-hover-bg} ) );
-                }
-            } @else {
-                @include fill( $bg: var( --kendo-grid-sticky-selected-hover-bg, #{$kendo-grid-sticky-selected-hover-bg} ) );
-            }
-        }
-    }
-
     .k-grouping-row {
         .k-grid-content-sticky {
             @include fill( $bg: var( --kendo-grid-sticky-header-bg, #{$kendo-grid-sticky-header-bg} ) );
diff --git a/packages/material/scss/grid/_theme.scss b/packages/material/scss/grid/_theme.scss
index d255683a19d..eae97eb9e3f 100644
--- a/packages/material/scss/grid/_theme.scss
+++ b/packages/material/scss/grid/_theme.scss
@@ -133,19 +133,6 @@
         }
     }
 
-    kendo-grid {
-        .k-grid-content-sticky {
-            border-color: $kendo-grid-sticky-border;
-            border-bottom-color: $kendo-grid-header-border;
-        }
-
-        .k-grid-row-sticky td,
-        .k-grid-row-sticky .k-table-td {
-            border-top-color: $kendo-grid-sticky-border;
-            border-bottom-color: $kendo-grid-sticky-border;
-        }
-    }
-
     .k-grid-header {
         .k-sorted,
         .k-link:hover {