Skip to content

Commit 16b2b71

Browse files
author
Alyar
committed
fix: exclude hidden and adaptive columns from banded header border selectors (T1318812)
1 parent 0e87a35 commit 16b2b71

3 files changed

Lines changed: 42 additions & 6 deletions

File tree

packages/devextreme-scss/scss/widgets/fluent/gridBase/layout/cell.scss

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,13 @@
174174
}
175175

176176
// (0,7,1)
177-
.dx-widget:not(.dx-rtl) .dx-#{$widget-name}-headers.dx-header-multi-row .dx-header-row:not(.dx-column-lines) > td:not(.dx-#{$widget-name}-first-cell, .dx-#{$widget-name}-sticky-column-border-left, .dx-#{$widget-name}-column-no-border) {
177+
.dx-widget:not(.dx-rtl) .dx-#{$widget-name}-headers.dx-header-multi-row .dx-header-row:not(.dx-column-lines) > td:not(
178+
.dx-#{$widget-name}-first-cell,
179+
.dx-#{$widget-name}-hidden-column,
180+
.dx-command-adaptive-hidden,
181+
.dx-#{$widget-name}-sticky-column-border-left,
182+
.dx-#{$widget-name}-column-no-border
183+
) {
178184
border-left: 1px solid;
179185
border-left-color: $datagrid-border-color;
180186
}
@@ -204,7 +210,13 @@
204210
}
205211

206212
// (0,6,1)
207-
.dx-rtl .dx-#{$widget-name}-headers.dx-header-multi-row .dx-header-row:not(.dx-column-lines) > td:not(.dx-#{$widget-name}-first-cell, .dx-#{$widget-name}-sticky-column-border-right, .dx-#{$widget-name}-column-no-border) {
213+
.dx-rtl .dx-#{$widget-name}-headers.dx-header-multi-row .dx-header-row:not(.dx-column-lines) > td:not(
214+
.dx-#{$widget-name}-first-cell,
215+
.dx-#{$widget-name}-hidden-column,
216+
.dx-command-adaptive-hidden,
217+
.dx-#{$widget-name}-sticky-column-border-right,
218+
.dx-#{$widget-name}-column-no-border
219+
) {
208220
border-right: 1px solid;
209221
border-right-color: $datagrid-border-color;
210222
}

packages/devextreme-scss/scss/widgets/generic/gridBase/layout/cell.scss

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,13 @@
225225
}
226226

227227
// (0,7,1)
228-
.dx-widget:not(.dx-rtl) .dx-#{$widget-name}-headers.dx-header-multi-row .dx-header-row:not(.dx-column-lines) > td:not(.dx-#{$widget-name}-first-cell, .dx-#{$widget-name}-sticky-column-border-left, .dx-#{$widget-name}-column-no-border) {
228+
.dx-widget:not(.dx-rtl) .dx-#{$widget-name}-headers.dx-header-multi-row .dx-header-row:not(.dx-column-lines) > td:not(
229+
.dx-#{$widget-name}-first-cell,
230+
.dx-#{$widget-name}-hidden-column,
231+
.dx-command-adaptive-hidden,
232+
.dx-#{$widget-name}-sticky-column-border-left,
233+
.dx-#{$widget-name}-column-no-border
234+
) {
229235
border-left: 1px solid;
230236
border-left-color: $datagrid-border-color;
231237
}
@@ -285,7 +291,13 @@
285291
}
286292

287293
// (0,6,1)
288-
.dx-rtl .dx-#{$widget-name}-headers.dx-header-multi-row .dx-header-row:not(.dx-column-lines) > td:not(.dx-#{$widget-name}-first-cell, .dx-#{$widget-name}-sticky-column-border-right, .dx-#{$widget-name}-column-no-border) {
294+
.dx-rtl .dx-#{$widget-name}-headers.dx-header-multi-row .dx-header-row:not(.dx-column-lines) > td:not(
295+
.dx-#{$widget-name}-first-cell,
296+
.dx-#{$widget-name}-hidden-column,
297+
.dx-command-adaptive-hidden,
298+
.dx-#{$widget-name}-sticky-column-border-right,
299+
.dx-#{$widget-name}-column-no-border
300+
) {
289301
border-right: 1px solid;
290302
border-right-color: $datagrid-border-color;
291303
}

packages/devextreme-scss/scss/widgets/material/gridBase/layout/cell.scss

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,13 @@
165165
}
166166

167167
// (0,7,1)
168-
.dx-widget:not(.dx-rtl) .dx-#{$widget-name}-headers.dx-header-multi-row .dx-header-row:not(.dx-column-lines) > td:not(.dx-#{$widget-name}-first-cell, .dx-#{$widget-name}-sticky-column-border-left, .dx-#{$widget-name}-column-no-border) {
168+
.dx-widget:not(.dx-rtl) .dx-#{$widget-name}-headers.dx-header-multi-row .dx-header-row:not(.dx-column-lines) > td:not(
169+
.dx-#{$widget-name}-first-cell,
170+
.dx-#{$widget-name}-hidden-column,
171+
.dx-command-adaptive-hidden,
172+
.dx-#{$widget-name}-sticky-column-border-left,
173+
.dx-#{$widget-name}-column-no-border
174+
) {
169175
border-left: 1px solid;
170176
border-left-color: $datagrid-border-color;
171177
}
@@ -220,7 +226,13 @@
220226
}
221227

222228
// (0,6,1)
223-
.dx-rtl .dx-#{$widget-name}-headers.dx-header-multi-row .dx-header-row:not(.dx-column-lines) > td:not(.dx-#{$widget-name}-first-cell, .dx-#{$widget-name}-sticky-column-border-right, .dx-#{$widget-name}-column-no-border) {
229+
.dx-rtl .dx-#{$widget-name}-headers.dx-header-multi-row .dx-header-row:not(.dx-column-lines) > td:not(
230+
.dx-#{$widget-name}-first-cell,
231+
.dx-#{$widget-name}-hidden-column,
232+
.dx-command-adaptive-hidden
233+
.dx-#{$widget-name}-sticky-column-border-right,
234+
.dx-#{$widget-name}-column-no-border
235+
) {
224236
border-right: 1px solid;
225237
border-right-color: $datagrid-border-color;
226238
}

0 commit comments

Comments
 (0)