@syncfusion/blazor-themes 22.2.12 → 23.1.36

package/SCSS-Themes/grids/grid/material.scss

@@ -37,6 +37,8 @@ $grid-bottom-border-size: $border-size !default;
 $grid-horizontal-border-size: $border-size !default;
 $grid-font-family: $font-family !default;
 $grid-maskedcell-virtual-background-color: rgba(0, 0, 0, .1) !default;
+$grid-frozen-shadow-background-color: rgba(0, 0, 0, .12) !default;
+$grid-frozen-row-shadow-background-color: rgba(0, 0, 0, .12) !default;
 
 $grid-headercell-div-padding: 0 .6em !default;
 $grid-grouped-headercell-span-padding: 0 !default;
@@ -272,6 +274,8 @@ $grid-filterbarcell-padding: 0 21px !default;
 $grid-vertical-border-size: 0 !default;
 $grid-content-padding: 8px !default;
 $grid-rowcell-line-height: 20px !default;
+$grid-rowcell-autofill-top-line-height: 18px !default;
+$grid-rowcell-autofill-top-bottom-line-height: 16px !default;
 $grid-headercell-line-height: 42px !default;
 $grid-filtercell-line-height: 42px !default;
 $grid-cell-border-color: $grey-300 !default;
@@ -384,6 +388,8 @@ $grid-bigger-header-first-last-cell-padding: round(math.div($grid-header-first-l
 $grid-bigger-content-padding: round(math.div($grid-content-padding, .75)) !default;
 $grid-bigger-content-right-padding: round(math.div($grid-content-right-padding, .75)) !default;
 $grid-bigger-rowcell-line-height: round(math.div($grid-rowcell-line-height, .75)) !default;
+$grid-bigger-rowcell-autofill-top-line-height: 25px !default;
+$grid-bigger-rowcell-autofill-top-bottom-line-height: 23px !default;
 $grid-bigger-first-last-rowcell-padding: round(math.div($grid-first-last-rowcell-padding, .75)) !default;
 $grid-bigger-group-line-height: round(math.div($grid-group-height, .75)) !default;
 $grid-bigger-group-headercell-height: round(math.div($grid-headecell-height, .75)) !default;
@@ -421,6 +427,7 @@ $grid-frozenborder-disabled-color: $content-bg-color !default;
 $grid-freezeline-right-border: rgba($accent, .6) !default;
 $grid-freezeline-border: 2px solid !default;
 $grid-cell-focus-shadow: 0 0 0 1px $grey-500 inset !default;
+$grid-cell-focus-border-color: $grey-500 !default;
 $grid-filtered-color: $accent !default;
 $grid-autofill-color: $accent !default;
 $grid-e-firstrow-dragborder-bcolor: $accent !default;
@@ -500,6 +507,8 @@ $grid-group-clone-box-shadow: 0 0 !default;
 $grid-unboundcelldiv-margin: 0 3.5px !default;
 $grid-bigger-flmenu-padding: $grid-flmenu-padding !default;
 $grid-rowcell-wrap-height: 18px !default;
+$grid-rowcell-autofill-top-height: 16px !default;
+$grid-rowcell-autofill-top-bottom-height: 14px !default;
 $grid-rowcell-wrap-max-height: 36px !default;
 $grid-bigger-fltr-sortnumber-rightalign-margin: 7px 2px 0 5px !default;
 $grid-bigger-sortnumber-rightalign-margin: $grid-bigger-fltr-sortnumber-rightalign-margin !default;
@@ -510,6 +519,8 @@ $grid-rtl-searchclear: 0 !default;
 $grid-column-chosser-searchdiv-top: -46px !default;
 $grid-reorderarrow-font-size: 8px !default;
 $grid-bigger-wrap-line-height: 18px !default;
+$grid-bigger-wrap-autofill-top-line-height: 16px !default;
+$grid-bigger-wrap-autofill-top-bottom-line-height: 14px !default;
 $grid-bigger-clone-padding: $grid-clone-padding !default;
 $grid-bigger-draganddrop-clone-padding: 0 !default;
 $grouped-bigger-text-font-size: $grouped-text-font-size !default;
@@ -1064,6 +1075,14 @@ $grid-dropitems-count-margin-left: -8px !default;
       line-height: $grid-bigger-rowcell-line-height;
     }
 
+    .e-xlsel-bottom-border.e-xlsel-top-border {
+      line-height: $grid-bigger-rowcell-autofill-top-bottom-line-height;
+    }
+  
+    .e-xlsel-bottom-border {
+      line-height: $grid-bigger-rowcell-autofill-top-line-height;
+    }
+
     .e-filterbarcell input {
       font-size: $grid-bigger-font-size;
     }
@@ -1440,7 +1459,7 @@ $grid-dropitems-count-margin-left: -8px !default;
 
       li.e-cclist {
         padding: $grid-bigger-columnchooser-li-padding;
-	@if $grid-skin == 'material3' {
+        @if $grid-skin == 'material3' {
           line-height: 24px;
         }
       }
@@ -1606,6 +1625,26 @@ $grid-dropitems-count-margin-left: -8px !default;
       background-color: $grid-e-firstrow-dragborder-bcolor;
       height: 2px;
       position: absolute;
+      z-index: 5;
+    }
+
+    .e-frozenrow-border {
+      background-color: $frozen-border-color;
+      height: 2px;
+      position: relative;
+      z-index: 5;
+    }
+
+    .e-frozenrow-border.e-frozenrow-empty {
+      height: 0;
+    }
+
+    &.e-top-shadow .e-frozenrow-border {
+      height: 4px;
+      margin-top: -4px;
+      background-color: transparent !important;
+      box-shadow: 0px 4px 8px $grid-frozen-row-shadow-background-color;
+      clip-path: inset(0px 0px -15px 0px)
     }
 
     .e-grid-relative {
@@ -1648,6 +1687,36 @@ $grid-dropitems-count-margin-left: -8px !default;
       border-bottom: 0;
     }
 
+    .e-gridcontent, .e-gridheader,
+    &.e-rtl .e-gridcontent,
+    &.e-rtl .e-gridheader {
+        & tr.e-row:first-child .e-rowcell.e-dragborder,
+        & .e-rowcell.e-dragborder,
+        & .e-rowdragdrop.e-dragborder,
+        & .e-detailrowcollapse.e-dragborder {
+        z-index: $grid-dragborder-z-index;
+        }
+    }
+
+    .e-gridcontent, .e-gridheader,
+    &.e-rtl .e-gridcontent,
+    &.e-rtl .e-gridheader {
+        & tr.e-row:first-child .e-rowcell.e-dragborder.e-leftfreeze,
+        & tr.e-row:first-child .e-rowcell.e-dragborder.e-rightfreeze,
+        & tr.e-row:first-child .e-rowcell.e-dragborder.e-fixedfreeze,
+        & .e-rowcell.e-dragborder.e-leftfreeze,
+        & .e-rowcell.e-dragborder.e-rightfreeze,
+        & .e-rowcell.e-dragborder.e-rightfreeze,
+        & .e-rowdragdrop.e-dragborder.e-leftfreeze,
+        & .e-rowdragdrop.e-dragborder.e-rightfreeze,
+        & .e-rowdragdrop.e-dragborder.e-fixedfreeze,
+        & .e-detailrowcollapse.e-dragborder.e-leftfreeze,
+        & .e-detailrowcollapse.e-dragborder.e-rightfreeze,
+        & .e-detailrowcollapse.e-dragborder.e-fixedfreeze {
+        z-index: 6;
+        }
+    }
+
     .e-gridcontent, .e-gridheader,
     &.e-rtl .e-gridcontent,
     &.e-rtl .e-gridheader {
@@ -1656,8 +1725,17 @@ $grid-dropitems-count-margin-left: -8px !default;
         & .e-rowdragdrop.e-dragborder,
         & .e-detailrowcollapse.e-dragborder {
         box-shadow: $grid-dragborder-box-shadow;
+        }
+    }
+
+    .e-gridcontent, .e-gridheader,
+    &.e-rtl .e-gridcontent,
+    &.e-rtl .e-gridheader {
+        & tr.e-row:first-child .e-rowcell.e-dragborder:not(.e-leftfreeze, .e-rightfreeze, .e-fixedfreeze),
+        & .e-rowcell.e-dragborder:not(.e-leftfreeze, .e-rightfreeze, .e-fixedfreeze),
+        & .e-rowdragdrop.e-dragborder:not(.e-leftfreeze, .e-rightfreeze, .e-fixedfreeze),
+        & .e-detailrowcollapse.e-dragborder:not(.e-leftfreeze, .e-rightfreeze, .e-fixedfreeze) {
         position: $grid-dragborder-position;
-        z-index: $grid-dragborder-z-index;
         }
     }
 
@@ -2082,6 +2160,14 @@ $grid-dropitems-count-margin-left: -8px !default;
       border-right: 0;
     }
 
+    & .e-gridheader .e-headercell.e-leftfreeze.e-freezeleftborder .e-rhandler {
+      border-right: 0;
+    }
+
+    &.e-rtl .e-gridheader .e-headercell.e-leftfreeze.e-freezeleftborder .e-rhandler {
+      border-left: 0;
+    }
+
     & .e-gridheader .e-frozenheader.e-frozen-right-header .e-headercell .e-rhandler,
     & .e-gridheader .e-frozenheader.e-frozen-right-header .e-headercell .e-rsuppress {
       left: 0;
@@ -2121,7 +2207,7 @@ $grid-dropitems-count-margin-left: -8px !default;
     }
 
     & .e-virtual-rhandler {
-      z-index: 1;
+      z-index: 5;
     }
 
     &.e-device .e-ricon::before {
@@ -2187,7 +2273,7 @@ $grid-dropitems-count-margin-left: -8px !default;
       overflow: hidden;
       padding: $grid-headercell-div-padding;
       text-align: left;
-	  text-transform: $grid-header-text-transform;
+      text-transform: $grid-header-text-transform;
       user-select: none;
     }
 
@@ -2219,12 +2305,17 @@ $grid-dropitems-count-margin-left: -8px !default;
       user-select: none;
     }
 
-    .e-gridcontent {
+    &:not(.e-left-shadow, .e-right-shadow) .e-gridcontent {
       & tr:first-child td {
         border-top: 0 none;
-      }
+      }   
     }
 
+    .e-gridcontent {
+      & tr:first-child td.e-xlsel-top-border {
+        border-top-width: 2px;
+      }   
+    }
 
     .e-gridheader {
       & tr:first-child th {
@@ -2255,11 +2346,12 @@ $grid-dropitems-count-margin-left: -8px !default;
       border-top-width: $grid-border-size;
     }
 
-    .e-frozenhdrcont {
+    .e-frozenhdrcont,
+    .e-frozenhdr {
       border-bottom-width: 0;
     }
 
-    .e-frozenhdrcont table tr:not(.e-editedrow):first-child td {
+    .e-frozenhdrcont table tr:not(.e-editedrow):first-child td:not(.e-xlsel-top-border) {
       border-top-style: $grid-border-type;
       border-top-width: $grid-bottom-border-size;
     }
@@ -2307,6 +2399,36 @@ $grid-dropitems-count-margin-left: -8px !default;
       width: auto;
     }
 
+    &.e-left-shadow .e-leftfreeze.e-freezeleftborder.e-focused:not(.e-menu-item,.e-xlsel-top-border,.e-xlsel-left-border,.e-xlsel-bottom-border,.e-xlsel-right-border),
+    &.e-right-shadow .e-rightfreeze.e-freezerightborder.e-focused:not(.e-menu-item,.e-xlsel-top-border,.e-xlsel-left-border,.e-xlsel-bottom-border,.e-xlsel-right-border) {
+      line-height: $grid-rowcell-autofill-top-line-height;
+      border-width : 1.5px;
+    }
+
+    &.e-rtl.e-left-shadow .e-leftfreeze.e-freezeleftborder.e-focused:not(.e-menu-item,.e-xlsel-top-border,.e-xlsel-left-border,.e-xlsel-bottom-border,.e-xlsel-right-border),
+    &.e-rtl.e-right-shadow .e-rightfreeze.e-freezerightborder.e-focused:not(.e-menu-item,.e-xlsel-top-border,.e-xlsel-left-border,.e-xlsel-bottom-border,.e-xlsel-right-border) {
+      line-height: $grid-rowcell-autofill-top-line-height;
+      border-width : 1.5px;
+    }
+
+    &.e-rtl.e-default.e-left-shadow .e-leftfreeze.e-freezeleftborder.e-focused:not(.e-menu-item,.e-xlsel-top-border,.e-xlsel-left-border,.e-xlsel-bottom-border,.e-xlsel-right-border),
+    &.e-rtl.e-default.e-right-shadow .e-rightfreeze.e-freezerightborder.e-focused:not(.e-menu-item,.e-xlsel-top-border,.e-xlsel-left-border,.e-xlsel-bottom-border,.e-xlsel-right-border) {
+      line-height: $grid-rowcell-autofill-top-line-height;
+      border-width : 1.5px;
+    }
+
+    &.e-wrap.e-left-shadow .e-leftfreeze.e-freezeleftborder.e-focused:not(.e-menu-item,.e-xlsel-top-border,.e-xlsel-left-border,.e-xlsel-bottom-border,.e-xlsel-right-border),
+    &.e-wrap.e-right-shadow .e-rightfreeze.e-freezerightborder.e-focused:not(.e-menu-item,.e-xlsel-top-border,.e-xlsel-left-border,.e-xlsel-bottom-border,.e-xlsel-right-border) {
+      line-height: $grid-rowcell-autofill-top-line-height;
+      border-width : 1.5px;
+    }
+
+    &.e-wrap.e-left-shadow .e-leftfreeze.e-freezeleftborder.e-focused:not(.e-menu-item,.e-xlsel-top-border,.e-xlsel-left-border,.e-xlsel-bottom-border,.e-xlsel-right-border),
+    &.e-wrap.e-right-shadow .e-rightfreeze.e-freezerightborder.e-focused:not(.e-menu-item,.e-xlsel-top-border,.e-xlsel-left-border,.e-xlsel-bottom-border,.e-xlsel-right-border) {
+      line-height: $grid-rowcell-autofill-top-line-height;
+      border-width : 1.5px;
+    }
+
     .e-frozenheader table .e-insertedrow td.e-rowcell,
     .e-frozencontent table .e-insertedrow td.e-rowcell,
     .e-movableheader table .e-insertedrow td.e-rowcell,
@@ -2435,7 +2557,7 @@ $grid-dropitems-count-margin-left: -8px !default;
       margin-top: $grid-td-checkbox-margin-top;
     }
 
-    &.e-default .e-rowcell.e-lastrowcell {
+    &.e-default .e-rowcell.e-lastrowcell:not(.e-xlsel-bottom-border) {
       border-bottom-width: 1px;
     }
 
@@ -2448,7 +2570,7 @@ $grid-dropitems-count-margin-left: -8px !default;
         border-bottom-color: $grid-header-border-color;
     }
 
-    &.e-bothlines .e-rowcell.e-lastrowcell {
+    &.e-bothlines .e-rowcell.e-lastrowcell:not(.e-xlsel-bottom-border) {
       border-bottom-width: 1px;
     }
 
@@ -2502,6 +2624,22 @@ $grid-dropitems-count-margin-left: -8px !default;
       border-width: $grid-stackedheadercell-border-size;
     }
 
+    &.e-default .e-stackedheadercell.e-leftfreeze.e-freezeleftborder {
+      border-right-width: 2px;
+    }
+
+    &.e-default .e-stackedheadercell.e-rightfreeze.e-freezerightborder {
+      border-left-width: 2px;
+    }
+
+    &.e-default .e-stackedheadercell.e-fixedfreeze.e-freezeleftborder {
+      border-left-width: 1px;
+    }
+
+    &.e-default .e-stackedheadercell.e-fixedfreeze.e-freezerightborder {
+      border-right-width: 1px;
+    }
+
     &.e-default.e-verticallines tr th:first-child:not(.e-firstcell) {
       border-left-width: 0;
     }
@@ -2515,18 +2653,43 @@ $grid-dropitems-count-margin-left: -8px !default;
       border-width: $grid-headercell-both-border-width;
     }
 
+    &.e-default table th[rowspan].e-leftfreeze.e-freezeleftborder {
+      border-right-width: 2px;
+    }
+  
+    &.e-default table th[rowspan].e-rightfreeze.e-freezerightborder {
+      border-left-width: 2px;
+    }
+  
+    &.e-default table th[rowspan].e-fixedfreeze.e-freezeleftborder {
+      border-left-width: 1px;
+    }
+      
+    &.e-default table th[rowspan].e-fixedfreeze.e-freezerightborder {
+      border-right-width: 1px;
+    }
+  
+    &.e-default.e-verticallines tr th:first-child:not(.e-firstcell) {
+      border-left-width: 0;
+    }
+
     tr  th.e-firstcell {
       border-left-style: $grid-border-type;
       border-left-width: $grid-border-size;
     }
 
     &.e-default tr {
-      & td:first-child,
-      & :not(.e-rtl) th.e-headercell:first-child:not(.e-firstcell):not(.e-headercell.e-frozen-left-border),
-      & th.e-detailheadercell:first-child,
-      & th.e-filterbarcell:first-child:not(.e-filterbarcell.e-frozen-left-border) {
-        border-left-width: 0;
+        & th.e-detailheadercell:first-child {
+          border-left-width: 0;
+        }
       }
+  
+    &.e-default:not(.e-rtl) tr {
+        & td:first-child:not(.e-xlsel-left-border, .e-fixedfreeze.e-freezeleftborder),
+        & th.e-headercell:first-child:not(.e-firstcell):not(.e-headercell.e-frozen-left-border),
+        & th.e-filterbarcell:first-child:not(.e-filterbarcell.e-frozen-left-border) {
+            border-left-width: 0;  
+        }
     }
 
     &.e-default .e-gridheader th.e-firstcell.e-movablefirst{
@@ -2828,7 +2991,7 @@ $grid-dropitems-count-margin-left: -8px !default;
     &.e-horizontallines,
     &.e-verticallines,
     &.e-hidelines {
-      & .e-rowcell.e-lastrowcell {
+      & .e-rowcell.e-lastrowcell:not(.e-xlsel-bottom-border) {
         border-bottom-width: $grid-border-size;
       }
     }
@@ -3590,11 +3753,11 @@ $grid-dropitems-count-margin-left: -8px !default;
       padding: 0;
     }
 
-    .e-gridcontent .e-normaledit .e-rowcell {
+    .e-gridcontent table tbody .e-normaledit .e-rowcell {
       border-top: $grid-border-size $grid-border-type;
     }
 
-    &:not(.e-row-responsive) .e-gridcontent tr.e-row:first-child .e-rowcell {
+    &:not(.e-row-responsive, .e-left-shadow, .e-right-shadow) .e-gridcontent tr.e-row:first-child .e-rowcell:not(.e-xlsel-top-border) {
       border-top: 0;
     }
 
@@ -3806,6 +3969,144 @@ $grid-dropitems-count-margin-left: -8px !default;
       border-right: 0;
     }
 
+    .e-tooltip-wrap.e-griderror.e-unfreeze {
+      z-index: 1;
+    }
+
+    .e-leftfreeze,
+    .e-rightfreeze {
+      position: sticky;
+      z-index: 2;
+    }
+
+    .e-fixedfreeze {
+      position: sticky;
+      z-index: 3;
+    }
+
+    .e-xlsel-top-border,
+    &.e-rtl.e-default .e-rowcell.e-xlsel-top-border {
+      border-top-width: 2px;
+      line-height: $grid-rowcell-autofill-top-line-height;
+    }
+    
+    .e-xlsel-left-border,
+    .e-fixedfreeze.e-freezeleftborder.e-xlsel-left-border,
+    &.e-rtl.e-default .e-rowcell.e-xlsel-left-border,
+    &.e-rtl.e-default .e-rowcell.e-fixedfreeze.e-freezeleftborder.e-xlsel-left-border {
+      border-left-width: 2px;
+    }
+
+    .e-xlsel-right-border,
+    .e-fixedfreeze.e-freezerightborder.e-xlsel-right-border,
+    &.e-rtl.e-default .e-rowcell.e-xlsel-right-border,
+    &.e-rtl.e-default .e-rowcell.e-fixedfreeze.e-freezerightborder.e-xlsel-right-border {
+      border-right-width: 2px;
+    }
+    &.e-wrap {
+      .e-xlsel-bottom-border.e-xlsel-top-border {
+        line-height: $grid-rowcell-autofill-top-height;
+      }
+      .e-xlsel-bottom-border {
+        line-height: $grid-rowcell-autofill-top-bottom-height;
+      }
+    }
+
+    &.e-rtl.e-wrap {
+      .e-xlsel-bottom-border.e-xlsel-top-border {
+        line-height: $grid-rowcell-autofill-top-height;
+      }
+      .e-xlsel-bottom-border {
+        line-height: $grid-rowcell-autofill-top-bottom-height;
+      }
+    }
+
+    .e-xlsel-bottom-border.e-xlsel-top-border {
+      line-height: $grid-rowcell-autofill-top-bottom-line-height;
+    }
+
+    &.e-rtl.e-default .e-rowcell.e-xlsel-bottom-border.e-xlsel-top-border {
+      line-height: $grid-rowcell-autofill-top-bottom-line-height;
+    }
+
+    .e-xlsel-bottom-border,
+    &.e-rtl.e-default .e-rowcell.e-xlsel-bottom-border {
+      border-bottom-width: 2px;
+      line-height: $grid-rowcell-autofill-top-line-height;
+    }
+
+    .e-virtual-content.e-content {
+      overflow-x: hidden;
+    }
+
+    .e-leftfreeze.e-freezeleftborder {
+      border-right-width: 2px;
+    }
+
+    &.e-left-shadow .e-leftfreeze.e-freezeleftborder:not(.e-dragborder) {
+      clip-path: inset(0 -15px 0 0);
+      box-shadow: 4px 0 8px $grid-frozen-shadow-background-color;
+    }
+
+    &.e-left-shadow .e-leftfreeze.e-freezeleftborder:not(.e-xlsel-right-border) {
+      border-right-color: transparent;
+    }
+
+    &.e-left-shadow .e-leftfreeze.e-freezeleftborder.e-dragborder {
+      box-shadow: $grid-dragborder-box-shadow, 4px 0 8px $grid-frozen-shadow-background-color;
+    }
+
+    &.e-rtl.e-left-shadow .e-leftfreeze.e-freezeleftborder:not(.e-dragborder) {
+      clip-path: inset(0 0 0 -15px);
+      box-shadow: -4px 0 8px $grid-frozen-shadow-background-color;
+    }
+
+    &.e-rtl.e-left-shadow .e-leftfreeze.e-freezeleftborder:not(.e-xlsel-left-border) {
+      border-left-color: transparent;
+    }
+
+    &.e-rtl.e-left-shadow .e-leftfreeze.e-freezeleftborder.e-dragborder {
+      box-shadow: $grid-dragborder-box-shadow, -4px 0 8px $grid-frozen-shadow-background-color;
+    }
+  
+    .e-rightfreeze.e-freezerightborder {
+      border-left-width: 2px;
+    }
+
+    &.e-right-shadow .e-rightfreeze.e-freezerightborder:not(.e-dragborder) {
+      clip-path: inset(0 0 0 -15px);
+      box-shadow: -4px 0 8px $grid-frozen-shadow-background-color;
+    }
+
+    &.e-right-shadow .e-rightfreeze.e-freezerightborder:not(.e-xlsel-left-border) {
+      border-left-color: transparent;
+    }
+
+    &.e-right-shadow .e-rightfreeze.e-freezerightborder.e-dragborder {
+      box-shadow: $grid-dragborder-box-shadow, -4px 0 8px $grid-frozen-shadow-background-color;
+    }
+
+    &.e-rtl.e-right-shadow .e-rightfreeze.e-freezerightborder:not(.e-dragborder) {
+      clip-path: inset(0 -15px 0 0);
+      box-shadow: 4px 0 8px $grid-frozen-shadow-background-color;
+    }
+
+    &.e-rtl.e-right-shadow .e-rightfreeze.e-freezerightborder:not(.e-xlsel-right-border) {
+      border-right-color: transparent;
+    }
+
+    &.e-rtl.e-right-shadow .e-rightfreeze.e-freezerightborder.e-dragborder {
+      box-shadow: $grid-dragborder-box-shadow, 4px 0 8px $grid-frozen-shadow-background-color;
+    }
+
+    .e-fixedfreeze.e-freezeleftborder {
+      border-left-width: 1px;
+    }
+
+    .e-fixedfreeze.e-freezerightborder {
+      border-right-width: 1px;
+    }
+
     .e-frozenheader {
       float: left;
       width: min-content;
@@ -3939,6 +4240,22 @@ $grid-dropitems-count-margin-left: -8px !default;
         }
       }
 
+      .e-leftfreeze.e-freezeleftborder {
+        border-left-width: 2px;
+      }
+    
+      .e-rightfreeze.e-freezerightborder {
+        border-right-width: 2px;
+      }
+  
+      .e-fixedfreeze.e-freezeleftborder {
+        border-right-width: 1px;
+      }
+  
+      .e-fixedfreeze.e-freezerightborder {
+        border-left-width: 1px;
+      }
+
       & .e-headercell,
       & .e-detailheadercell {
         border-width: $grid-rtl-headercell-border-width;
@@ -4122,6 +4439,48 @@ $grid-dropitems-count-margin-left: -8px !default;
         border-width: $grid-rowcell-broder-width;
       }
 
+      & .e-rowcell.e-leftfreeze.e-freezeleftborder {
+        border-left-width: 2px;
+      }
+
+      & .e-rowcell.e-rightfreeze.e-freezerightborder {
+        border-right-width: 2px;
+      }
+
+      & .e-rowcell.e-fixedfreeze.e-freezeleftborder:not(.e-xlsel-right-border) {
+        border-right-width: 1px;
+      }
+
+      & .e-rowcell.e-fixedfreeze.e-freezerightborder:not(.e-xlsel-left-border) {
+        border-left-width: 1px;
+      }
+
+      & .e-stackedheadercell.e-leftfreeze.e-freezeleftborder {
+        border-left-width: 2px;
+      }
+  
+      & .e-stackedheadercell.e-rightfreeze.e-freezerightborder {
+        border-right-width: 2px;
+      }
+  
+      & .e-stackedheadercell.e-fixedfreeze.e-freezeleftborder {
+        border-right-width: 1px;
+      }
+  
+      & .e-stackedheadercell.e-fixedfreeze.e-freezerightborder {
+        border-left-width: 1px;
+      }
+
+      & .e-summarycell.e-rightfreeze.e-freezerightborder,
+      & .e-summarycell.e-fixedfreeze.e-freezeleftborder {
+        border-left-width: 0;
+      }
+
+      & .e-summarycell.e-leftfreeze.e-freezeleftborder,
+      & .e-summarycell.e-fixedfreeze.e-freezerightborder {
+        border-right-width: 0;
+      }
+
       & .e-filterbarcell,
       & .e-filterbarcelldisabled {
         border-width: $grid-filterbarcell-border-width;
@@ -4158,9 +4517,9 @@ $grid-dropitems-count-margin-left: -8px !default;
         border-left-width: 0;
       }
 
-      &.e-default tr {
-        & td:last-child,
-        & th:last-child {
+      &.e-default {
+        & tr td:last-child:not(.e-xlsel-left-border),
+        & .e-gridheader table tr th:last-child {
           border-left: 0;
         }
       }
@@ -4292,6 +4651,22 @@ $grid-dropitems-count-margin-left: -8px !default;
         border-width: $grid-rtl-headercell-both-border-width;
       }
 
+      &.e-default table th[rowspan].e-leftfreeze.e-freezeleftborder {
+        border-left-width: 2px;
+      }
+    
+      &.e-default table th[rowspan].e-rightfreeze.e-freezerightborder {
+        border-right-width: 2px;
+      }
+    
+      &.e-default table th[rowspan].e-fixedfreeze.e-freezeleftborder {
+        border-right-width: 1px;
+      }
+        
+      &.e-default table th[rowspan].e-fixedfreeze.e-freezerightborder {
+        border-left-width: 1px;
+      }
+
       &.e-default.e-bothlines .e-gridheader .e-headercell.e-firstheader,
       &.e-default.e-bothlines .e-gridheader th.e-grouptopleftcell.e-lastgrouptopleftcell {
         border-left: 1px solid;
@@ -4336,7 +4711,7 @@ $grid-dropitems-count-margin-left: -8px !default;
       &.e-horizontallines,
       &.e-verticallines,
       &.e-hidelines {
-        & .e-rowcell.e-lastrowcell {
+        & .e-rowcell.e-lastrowcell:not(.e-xlsel-bottom-border) {
           border-bottom-width: $grid-border-size;
         }
       }
@@ -4380,7 +4755,7 @@ $grid-dropitems-count-margin-left: -8px !default;
         float: left;
       }
 
-      & tr:not(.e-summaryrow) td.e-indentcell {
+      & .e-gridcontent table tr:not(.e-summaryrow) td.e-indentcell {
         border-style: $grid-border-type;
         border-width: 0 0 0 $grid-border-size;
       }
@@ -4455,6 +4830,15 @@ $grid-dropitems-count-margin-left: -8px !default;
       word-wrap: break-word;
     }
 
+    & .e-frozenhdrcont.e-wrap  {
+      .e-xlsel-bottom-border.e-xlsel-top-border {
+        line-height: $grid-rowcell-autofill-top-bottom-height;
+      }
+      .e-xlsel-bottom-border {
+        line-height: $grid-rowcell-autofill-top-height;
+      }
+    }
+
     & .e-stackedheadercelldiv {
       overflow: hidden;
       text-overflow: ellipsis;
@@ -4505,18 +4889,18 @@ $grid-dropitems-count-margin-left: -8px !default;
     &.e-resize-lines,
     &.e-resize-lines.e-rtl {
 
-      & th.e-headercell.e-stackedheadercell,
-      & th.e-headercell.e-firstcell {
+      & th.e-headercell.e-stackedheadercell:not(.e-freezerightborder, .e-freezeleftborder),
+      & th.e-headercell.e-firstcell:not(.e-freezerightborder, .e-freezeleftborder) {
         border-left: 0;
         border-right: 0;
         border-top: 0;
       }
 
-      & tr.e-columnheader th:last-child.e-stackedheadercell .e-rhandler.e-rcursor :not(.e-laststackcell) {
+      & tr.e-columnheader th:last-child.e-stackedheadercell .e-rhandler.e-rcursor :not(.e-laststackcell, .e-freezerightborder, .e-freezeleftborder) {
         border-right: 0;
       }
 
-      &.e-default table th[rowspan] {
+      &.e-default table th[rowspan]:not(.e-freezerightborder, .e-freezeleftborder) {
         border-left: 0;
       }
     }
@@ -4704,7 +5088,7 @@ $grid-dropitems-count-margin-left: -8px !default;
       .e-cc-contentdiv .e-choosercheck {
         white-space: $grid-filter-checkbox-white-space;
       }
-	  
+
       .e-filterdiv .e-multiselect.e-input-group:not(.e-rtl),
       .e-fltrtempdiv .e-multiselect.e-input-group:not(.e-rtl){
         text-align: left;
@@ -5549,6 +5933,11 @@ $grid-dropitems-count-margin-left: -8px !default;
       box-shadow: $grid-cell-focus-shadow;
     }
 
+    &.e-left-shadow .e-leftfreeze.e-freezeleftborder.e-focused:not(.e-menu-item,.e-xlsel-top-border,.e-xlsel-left-border,.e-xlsel-bottom-border,.e-xlsel-right-border),
+    &.e-right-shadow .e-rightfreeze.e-freezerightborder.e-focused:not(.e-menu-item,.e-xlsel-top-border,.e-xlsel-left-border,.e-xlsel-bottom-border,.e-xlsel-right-border) {
+      border-color: $grid-cell-focus-border-color;
+    }
+
     .e-gridheader .e-icons:not(.e-icon-hide):not(.e-check):not(.e-stop):not(.e-icon-reorderuparrow):not(.e-icon-reorderdownarrow) {
       color: $grid-icon-default-color;
     }
@@ -5586,6 +5975,10 @@ $grid-dropitems-count-margin-left: -8px !default;
       z-index: 1;
     }
 
+    .e-autofill.e-freeze-autofill {
+      z-index: 5;
+    }
+
     .e-xlsel {
       background-color: transparent;
       border-style: solid;
@@ -5597,6 +5990,7 @@ $grid-dropitems-count-margin-left: -8px !default;
       background-color: $grid-autofill-color;
       border-color: $grid-autofill-color;
       position: absolute;
+      z-index: 3;
     }
 
     .e-gridcontent tr.e-row:first-child .e-rowcell.e-dragborder,
@@ -5609,10 +6003,57 @@ $grid-dropitems-count-margin-left: -8px !default;
     &.e-rtl .e-gridcontent .e-rowcell.e-dragborder,
     &.e-rtl .e-gridcontent .e-rowdragdrop.e-dragborder {
       box-shadow: $grid-dragborder-box-shadow;
-      position: $grid-dragborder-position;
       z-index: $grid-dragborder-z-index;
     }
 
+    .e-gridcontent tr.e-row:first-child .e-rowcell.e-dragborder.e-leftfreeze,
+    .e-gridcontent .e-rowcell.e-dragborder.e-leftfreeze,
+    .e-gridcontent .e-groupcaption.e-dragborder.e-leftfreeze,
+    .e-gridcontent .e-summarycell.e-dragborder.e-leftfreeze,
+    .e-gridcontent .e-rowdragdrop.e-dragborder.e-leftfreeze,
+    & .e-gridheader thead tr th.e-firstrowdragborder.e-leftfreeze,
+    &.e-rtl .e-gridcontent tr.e-row:first-child .e-rowcell.e-dragborder.e-leftfreeze,
+    &.e-rtl .e-gridcontent .e-rowcell.e-dragborder.e-leftfreeze,
+    &.e-rtl .e-gridcontent .e-rowdragdrop.e-dragborder.e-leftfreeze {
+      z-index: 6;
+    }
+
+    .e-gridcontent tr.e-row:first-child .e-rowcell.e-dragborder.e-rightfreeze,
+    .e-gridcontent .e-rowcell.e-dragborder.e-rightfreeze,
+    .e-gridcontent .e-groupcaption.e-dragborder.e-rightfreeze,
+    .e-gridcontent .e-summarycell.e-dragborder.e-rightfreeze,
+    .e-gridcontent .e-rowdragdrop.e-dragborder.e-rightfreeze,
+    & .e-gridheader thead tr th.e-firstrowdragborder.e-rightfreeze,
+    &.e-rtl .e-gridcontent tr.e-row:first-child .e-rowcell.e-dragborder.e-rightfreeze,
+    &.e-rtl .e-gridcontent .e-rowcell.e-dragborder.e-rightfreeze,
+    &.e-rtl .e-gridcontent .e-rowdragdrop.e-dragborder.e-rightfreeze {
+      z-index: 6;
+    }
+
+    .e-gridcontent tr.e-row:first-child .e-rowcell.e-dragborder.e-fixedfreeze,
+    .e-gridcontent .e-rowcell.e-dragborder.e-fixedfreeze,
+    .e-gridcontent .e-groupcaption.e-dragborder.e-fixedfreeze,
+    .e-gridcontent .e-summarycell.e-dragborder.e-fixedfreeze,
+    .e-gridcontent .e-rowdragdrop.e-dragborder.e-fixedfreeze,
+    & .e-gridheader thead tr th.e-firstrowdragborder.e-fixedfreeze,
+    &.e-rtl .e-gridcontent tr.e-row:first-child .e-rowcell.e-dragborder.e-fixedfreeze,
+    &.e-rtl .e-gridcontent .e-rowcell.e-dragborder.e-fixedfreeze,
+    &.e-rtl .e-gridcontent .e-rowdragdrop.e-dragborder.e-fixedfreeze {
+      z-index: 6;
+    }
+
+    .e-gridcontent tr.e-row:first-child .e-rowcell.e-dragborder:not(.e-leftfreeze, .e-rightfreeze, .e-fixedfreeze),
+    .e-gridcontent .e-rowcell.e-dragborder:not(.e-leftfreeze, .e-rightfreeze, .e-fixedfreeze),
+    .e-gridcontent .e-groupcaption.e-dragborder:not(.e-leftfreeze, .e-rightfreeze, .e-fixedfreeze),
+    .e-gridcontent .e-summarycell.e-dragborder:not(.e-leftfreeze, .e-rightfreeze, .e-fixedfreeze),
+    .e-gridcontent .e-rowdragdrop.e-dragborder:not(.e-leftfreeze, .e-rightfreeze, .e-fixedfreeze),
+    & .e-gridheader thead tr th.e-firstrowdragborder:not(.e-leftfreeze, .e-rightfreeze, .e-fixedfreeze),
+    &.e-rtl .e-gridcontent tr.e-row:first-child .e-rowcell.e-dragborder:not(.e-leftfreeze, .e-rightfreeze, .e-fixedfreeze),
+    &.e-rtl .e-gridcontent .e-rowcell.e-dragborder:not(.e-leftfreeze, .e-rightfreeze, .e-fixedfreeze),
+    &.e-rtl .e-gridcontent .e-rowdragdrop.e-dragborder:not(.e-leftfreeze, .e-rightfreeze, .e-fixedfreeze) {
+      position: $grid-dragborder-position;
+    }
+
     .e-gridheader {
       background-color: $grid-header-bg-color;
       border-bottom-color: $grid-outter-border;
@@ -5626,6 +6067,12 @@ $grid-dropitems-count-margin-left: -8px !default;
       }
     }
 
+    .e-gridcontent {
+      & tr:first-child td.e-xlsel-top-border {
+        border-top-color: $frozen-border-color;
+      }
+    }
+
     th.e-headercell[aria-sort = 'ascending'] .e-headertext,
     th.e-headercell[aria-sort = 'descending'] .e-headertext,
     th.e-headercell[aria-sort = 'ascending'] .e-sortfilterdiv,
@@ -5773,6 +6220,92 @@ $grid-dropitems-count-margin-left: -8px !default;
       border-right-color: $grid-frozenborder-disabled-color;
     }
 
+    &.e-rtl .e-leftfreeze.e-freezeleftborder {
+      border-left-color: $frozen-border-color;
+    }
+      
+    &.e-rtl .e-rightfreeze.e-freezerightborder {
+      border-right-color: $frozen-border-color;
+    }
+    
+    &.e-rtl .e-filterbarcell.e-fixedfreeze.e-freezeleftborder,
+    &.e-rtl .e-fixedfreeze.e-freezeleftborder {
+      border-right-color: $frozen-border-color;
+    }
+    
+    &.e-rtl .e-filterbarcell.e-fixedfreeze.e-freezerightborder,
+    &.e-rtl .e-fixedfreeze.e-freezerightborder  {
+      border-left-color: $frozen-border-color;
+    }
+
+    .e-leftfreeze.e-freezeleftborder {
+      border-right-color: $frozen-border-color;
+    }
+
+    .e-rightfreeze.e-freezerightborder {
+      border-left-color: $frozen-border-color;
+    }
+
+    .e-filterbarcell.e-fixedfreeze.e-freezeleftborder,
+    .e-fixedfreeze.e-freezeleftborder {
+      border-left-color: $frozen-border-color;
+    }
+
+    .e-filterbarcell.e-fixedfreeze.e-freezerightborder,
+    .e-fixedfreeze.e-freezerightborder  {
+      border-right-color: $frozen-border-color;
+    }
+
+    .e-xlsel-top-border {
+      border-top-color: $frozen-border-color;
+    }
+
+    .e-xlsel-left-border {
+      border-left-color: $frozen-border-color;
+    }
+
+    .e-xlsel-right-border {
+      border-right-color: $frozen-border-color;
+    }
+
+    .e-xlsel-bottom-border {
+      border-bottom-color: $frozen-border-color;
+    }
+
+    .e-leftfreeze:not(.e-summarycell, .e-indentcell, .e-updatedtd, .e-selectionbackground, .e-columnselection, .e-groupcaption, .e-cellselectionbackground),
+    .e-rightfreeze:not(.e-summarycell, .e-updatedtd, .e-selectionbackground, .e-columnselection, .e-groupcaption, .e-cellselectionbackground),
+    .e-fixedfreeze:not(.e-summarycell, .e-selectionbackground, .e-updatedtd, .e-columnselection, .e-groupcaption, .e-cellselectionbackground) {
+      @if $grid-skin == 'material' $grid-skin == 'highcontrast' {
+        background-color: $grid-rows-bg-color;
+      }
+      @else {
+        background-color: $grid-content-bg-color;
+      }
+    }
+
+    .e-gridcontent .e-groupcaptionrow .e-leftfreeze.e-groupcaption,
+    .e-gridcontent .e-groupcaptionrow .e-leftfreeze.e-recordplusexpand,
+    .e-gridcontent .e-groupcaptionrow .e-leftfreeze.e-recordpluscollapse,
+    .e-gridcontent .e-groupcaptionrow .e-leftfreeze.ee-indentcell {
+      @if $grid-skin == 'material3' {
+        background: $group-row-bg-color;
+      }
+      @else {
+        background-color: $group-row-bg-color;
+      }
+    }
+
+    .e-gridfooter .e-leftfreeze,
+    .e-gridfooter .e-rightfreeze,
+    .e-gridfooter .e-fixedfreeze {
+      @if $grid-skin == 'material3' {
+        background: $grid-summary-row-bg-color;
+      }
+      @else {
+        background-color: $grid-summary-row-bg-color;
+      }
+    }
+
     .e-frozenheader.e-frozen-right-header > .e-table,
     .e-frozencontent.e-frozen-right-content > .e-table,
     .e-rowcell .e-frozen-default-cursor,
@@ -5810,6 +6343,34 @@ $grid-dropitems-count-margin-left: -8px !default;
       }
     }
 
+    &.e-gridhover .e-row tr:not(.e-disable-gridhover):not(.e-editedrow):not(.e-detailrow):hover .e-rowcell.e-leftfreeze,
+    &.e-gridhover .e-row tr:not(.e-disable-gridhover):not(.e-editedrow):not(.e-detailrow):hover .e-rowcell.e-rightfreeze,
+    &.e-gridhover .e-row tr:not(.e-disable-gridhover):not(.e-editedrow):not(.e-detailrow):hover .e-rowcell.e-unfreeze,
+    &.e-gridhover .e-row tr:not(.e-disable-gridhover):not(.e-editedrow):not(.e-detailrow):hover .e-rowcell.e-fixedfreeze,
+    &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-editedrow):not(.e-detailrow):hover .e-rowcell.e-leftfreeze,
+    &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-editedrow):not(.e-detailrow):hover .e-rowcell.e-rightfreeze,
+    &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-editedrow):not(.e-detailrow):hover .e-rowcell.e-unfreeze,
+    &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-editedrow):not(.e-detailrow):hover .e-rowcell.e-fixedfreeze,
+    &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-detailrowcollapse.e-leftfreeze,
+    &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-detailrowcollapse.e-rightfreeze,
+    &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-detailrowcollapse.e-unfreeze,
+    &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-detailrowcollapse.e-fixedfreeze,
+    &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-rowdragdrop.e-leftfreeze,
+    &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-rowdragdrop.e-rightfreeze,
+    &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-rowdragdrop.e-unfreeze,
+    &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-rowdragdrop.e-fixedfreeze,
+    &.e-rtl .e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-rowdragdrop.e-leftfreeze,
+    &.e-rtl .e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-rowdragdrop.e-rightfreeze,
+    &.e-rtl .e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-rowdragdrop.e-unfreeze,
+    &.e-rtl .e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-rowdragdrop.e-fixedfreeze,
+    &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-detailrowexpand {
+      &:not(.e-cellselectionbackground):not(.e-active):not(.e-updatedtd):not(.e-indentcell) {
+        @if $grid-skin == 'material3' or grid-skin == 'bootstrap4' {
+          background-color: rgb(250 244 244);
+        }
+      }
+    }
+
     &.e-gridhover .e-dragclone .e-row tr:not(.e-disable-gridhover):not(.e-editedrow):not(.e-detailrow):hover .e-rowcell,
     &.e-gridhover .e-dragclone .e-row:not(.e-disable-gridhover):not(.e-editedrow):not(.e-detailrow):hover .e-rowcell,
     &.e-gridhover .e-dragclone .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-detailrowcollapse,
@@ -5837,6 +6398,34 @@ $grid-dropitems-count-margin-left: -8px !default;
           }
         }
       }
+
+      &.e-gridhover .e-row tr:not(.e-disable-gridhover):not(.e-editedrow):not(.e-detailrow):hover .e-rowcell.e-leftfreeze,
+      &.e-gridhover .e-row tr:not(.e-disable-gridhover):not(.e-editedrow):not(.e-detailrow):hover .e-rowcell.e-rightfreeze,
+      &.e-gridhover .e-row tr:not(.e-disable-gridhover):not(.e-editedrow):not(.e-detailrow):hover .e-rowcell.e-unfreeze,
+      &.e-gridhover .e-row tr:not(.e-disable-gridhover):not(.e-editedrow):not(.e-detailrow):hover .e-rowcell.e-fixedfreeze,
+      &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-editedrow):not(.e-detailrow):hover .e-rowcell.e-leftfreeze,
+      &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-editedrow):not(.e-detailrow):hover .e-rowcell.e-rightfreeze,
+      &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-editedrow):not(.e-detailrow):hover .e-rowcell.e-unfreeze,
+      &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-editedrow):not(.e-detailrow):hover .e-rowcell.e-fixedfreeze,
+      &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-detailrowcollapse.e-leftfreeze,
+      &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-detailrowcollapse.e-rightfreeze,
+      &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-detailrowcollapse.e-unfreeze,
+      &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-detailrowcollapse.e-fixedfreeze,
+      &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-rowdragdrop.e-leftfreeze,
+      &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-rowdragdrop.e-rightfreeze,
+      &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-rowdragdrop.e-unfreeze,
+      &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-rowdragdrop.e-fixedfreeze,
+      &.e-rtl .e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-rowdragdrop.e-leftfreeze,
+      &.e-rtl .e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-rowdragdrop.e-rightfreeze,
+      &.e-rtl .e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-rowdragdrop.e-unfreeze,
+      &.e-rtl .e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-rowdragdrop.e-fixedfreeze,
+      &.e-gridhover .e-row:not(.e-disable-gridhover):not(.e-detailrow):hover .e-detailrowexpand {
+        &:not(.e-cellselectionbackground):not(.e-active):not(.e-updatedtd):not(.e-indentcell) {
+          @if $grid-skin == 'material3' or $grid-skin == 'bootstrap4' {
+            background-color: rgb(250 244 244);
+          }
+        }
+      }
     }
 
     & .e-row:hover .e-rowdragdrop {
@@ -5871,6 +6460,22 @@ $grid-dropitems-count-margin-left: -8px !default;
       color: $grid-row-selection-color;
     }
 
+    td.e-active.e-leftfreeze:not(.e-updatedtd),
+    td.e-active.e-unfreeze:not(.e-updatedtd),
+    td.e-active.e-rightfreeze:not(.e-updatedtd),
+    td.e-active.e-fixedfreeze:not(.e-updatedtd),
+    .e-columnselection.e-leftfreeze:not(.e-updatedtd),
+    .e-columnselection.e-unfreeze:not(.e-updatedtd),
+    .e-columnselection.e-rightfreeze:not(.e-updatedtd),
+    .e-columnselection.e-fixedfreeze:not(.e-updatedtd) {
+      @if $grid-skin == 'material3' {
+        background-color: rgba($primary-container, 1);
+      }
+      @else if $grid-skin == 'bootstrap4' {
+        background-color: rgb(212 205 205);
+      }
+    }
+
     .e-columnselection {
       background-color: $grid-row-selection-bg-color;
     }
@@ -5961,7 +6566,7 @@ $grid-dropitems-count-margin-left: -8px !default;
       border: 0 none;
     }
 
-    &.e-resize-lines .e-headercell.e-stackedheadercell {
+    &.e-resize-lines .e-headercell.e-stackedheadercell:not(.e-freezerightborder, .e-freezeleftborder) {
       border-bottom: 1px solid $grid-header-border-color;
       border-right: 1px solid $grid-header-border-color;
     }
@@ -6101,12 +6706,12 @@ $grid-dropitems-count-margin-left: -8px !default;
       color: $grid-content-batch-font-color;
     }
 
-    .e-gridcontent .e-normaledit .e-rowcell {
+    .e-gridcontent table tbody .e-normaledit .e-rowcell {
       border-top-color: $grid-header-border-color;
     }
 
-    .e-gridcontent .e-normaledit .e-dragindentcell,
-    .e-gridcontent .e-normaledit .e-detailrowcollapse {
+    .e-gridcontent table tbody .e-normaledit .e-dragindentcell,
+    .e-gridcontent table tbody .e-normaledit .e-detailrowcollapse {
       border-top: 1px solid $grid-header-border-color;
     }
 
@@ -6131,7 +6736,7 @@ $grid-dropitems-count-margin-left: -8px !default;
         padding-top: 6px;
         padding-bottom: 6px;
       }
-
+      
       &.e-focused {
         box-shadow: none;
       }