fix container

DevExpress · Sep 23, 2024 · 66c821b · 66c821b
1 parent c1fa066
commit 66c821b
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 15 deletions.
diff --git a/packages/devextreme-scss/scss/widgets/fluent/dataGrid/_index.scss b/packages/devextreme-scss/scss/widgets/fluent/dataGrid/_index.scss
@@ -84,6 +84,10 @@
     td {
       border-top-color: $fluent-grid-base-border-color;
       border-bottom-color: $fluent-grid-base-border-color;
+
+      &.dx-datagrid-sticky-column, &.dx-datagrid-sticky-column-left, &.dx-datagrid-sticky-column-right {
+        background-color: $datagrid-group-row-bg;
+      }
     }
   }
 }
@@ -125,11 +129,15 @@
 }
 
 .dx-datagrid-rowsview {
-  .dx-group-cell:has(.dx-datagrid-group-row-container) {
-    padding-left: 0px;
-    padding-right: 0px;
-    overflow: initial;
-    background-color: transparent;
+  .dx-row.dx-group-row {
+    .dx-group-cell {
+      &.dx-datagrid-sticky-column, &.dx-datagrid-sticky-column-left, &.dx-datagrid-sticky-column-right {
+        padding-left: 0px;
+        padding-right: 0px;
+        overflow: initial;
+        background-color: transparent;
+      }
+    }
   }
 
   .dx-datagrid-group-row-container {

diff --git a/packages/devextreme-scss/scss/widgets/generic/dataGrid/_index.scss b/packages/devextreme-scss/scss/widgets/generic/dataGrid/_index.scss
@@ -76,6 +76,10 @@
     td {
       border-top-color: $generic-grid-base-border-color;
       border-bottom-color: $generic-grid-base-border-color;
+
+      &.dx-datagrid-sticky-column, &.dx-datagrid-sticky-column-left, &.dx-datagrid-sticky-column-right {
+        background-color: $datagrid-group-row-bg;
+      }
     }
   }
 }
@@ -130,11 +134,15 @@
 }
 
 .dx-datagrid-rowsview {
-  .dx-group-cell:has(.dx-datagrid-group-row-container) {
-    padding-left: 0px;
-    padding-right: 0px;
-    overflow: initial;
-    background-color: transparent;
+  .dx-row.dx-group-row {
+    .dx-group-cell {
+      &.dx-datagrid-sticky-column, &.dx-datagrid-sticky-column-left, &.dx-datagrid-sticky-column-right {
+        padding-left: 0px;
+        padding-right: 0px;
+        overflow: initial;
+        background-color: transparent;
+      }
+    }
   }
 
   .dx-datagrid-group-row-container {

diff --git a/packages/devextreme-scss/scss/widgets/material/dataGrid/_index.scss b/packages/devextreme-scss/scss/widgets/material/dataGrid/_index.scss
@@ -81,6 +81,10 @@
     td {
       border-top-color: $material-grid-base-border-color;
       border-bottom-color: $material-grid-base-border-color;
+
+      &.dx-datagrid-sticky-column, &.dx-datagrid-sticky-column-left, &.dx-datagrid-sticky-column-right {
+        background-color: $datagrid-group-row-bg;
+      }
     }
   }
 }
@@ -123,11 +127,15 @@
 
 
 .dx-datagrid-rowsview {
-  .dx-group-cell:has(.dx-datagrid-group-row-container) {
-    padding-left: 0px;
-    padding-right: 0px;
-    overflow: initial;
-    background-color: transparent;
+  .dx-row.dx-group-row {
+    .dx-group-cell {
+      &.dx-datagrid-sticky-column, &.dx-datagrid-sticky-column-left, &.dx-datagrid-sticky-column-right {
+        padding-left: 0px;
+        padding-right: 0px;
+        overflow: initial;
+        background-color: transparent;
+      }
+    }
   }
 
   .dx-datagrid-group-row-container {