Skip to content

Commit b25d5f6

Browse files
work around the SASS shorthand serializer bug for mixed colors
1 parent 91836ce commit b25d5f6

4 files changed

Lines changed: 24 additions & 12 deletions

File tree

packages/devextreme-scss/scss/widgets/base/dataGrid/_index.scss

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ $datagrid-text-stub-background-image-path: null !default;
9797
&.dx-state-focused .dx-datagrid-group-panel {
9898
.dx-group-panel-item:focus,
9999
.dx-header-filter:focus {
100-
outline: 2px solid $datagrid-focused-border-color;
100+
outline: 2px solid;
101+
outline-color: $datagrid-focused-border-color;
101102
outline-offset: -2px;
102103
}
103104

@@ -116,7 +117,8 @@ $datagrid-text-stub-background-image-path: null !default;
116117
&.dx-state-focused .dx-header-row {
117118
td:focus,
118119
td .dx-header-filter:focus {
119-
outline: 2px solid $datagrid-focused-border-color;
120+
outline: 2px solid;
121+
outline-color: $datagrid-focused-border-color;
120122
outline-offset: 2px;
121123
}
122124

@@ -172,7 +174,8 @@ $datagrid-text-stub-background-image-path: null !default;
172174

173175
.dx-datagrid-rowsview.dx-state-focused .dx-data-row {
174176
& > td.dx-command-edit > a.dx-link:focus {
175-
outline: 2px solid $datagrid-focused-border-color;
177+
outline: 2px solid;
178+
outline-color: $datagrid-focused-border-color;
176179
outline-offset: 2px;
177180
}
178181

@@ -301,7 +304,8 @@ $datagrid-text-stub-background-image-path: null !default;
301304
.dx-icon-filter:focus,
302305
.dx-datagrid-filter-panel-text:focus,
303306
.dx-datagrid-filter-panel-clear-filter:focus {
304-
outline: 2px solid $datagrid-focused-border-color;
307+
outline: 2px solid;
308+
outline-color: $datagrid-focused-border-color;
305309
outline-offset: 3px;
306310
}
307311
}
@@ -453,7 +457,8 @@ $datagrid-text-stub-background-image-path: null !default;
453457
}
454458

455459
&:focus-within {
456-
outline: 2px solid $datagrid-focused-border-color;
460+
outline: 2px solid;
461+
outline-color: $datagrid-focused-border-color;
457462
outline-offset: -2px;
458463
}
459464
}

packages/devextreme-scss/scss/widgets/base/treeList/_index.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,8 @@ $treelist-row-error-color: $datagrid-row-error-color;
203203

204204
.dx-treelist-rowsview.dx-state-focused .dx-data-row {
205205
& > td.dx-command-edit > a.dx-link:focus {
206-
outline: 2px solid $datagrid-focused-border-color;
206+
outline: 2px solid;
207+
outline-color: $datagrid-focused-border-color;
207208
outline-offset: 2px;
208209
}
209210

packages/devextreme-scss/scss/widgets/generic/gridBase/_index.scss

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,8 @@ $generic-grid-base-cell-input-height: math.round($generic-base-line-height * $ge
420420
}
421421

422422
.dx-#{$widget-name}-focus-overlay {
423-
border: 2px solid $datagrid-focused-border-color;
423+
border: 2px solid;
424+
border-color: $datagrid-focused-border-color;
424425
}
425426

426427
.dx-#{$widget-name}-table {
@@ -524,7 +525,8 @@ $generic-grid-base-cell-input-height: math.round($generic-base-line-height * $ge
524525
color: $datagrid-menu-icon-color;
525526

526527
&::after {
527-
border: 2px solid $datagrid-focused-border-color;
528+
border: 2px solid;
529+
border-color: $datagrid-focused-border-color;
528530
}
529531

530532
&.dx-menu-item-expanded {
@@ -589,7 +591,8 @@ $generic-grid-base-cell-input-height: math.round($generic-base-line-height * $ge
589591
}
590592

591593
&.dx-state-focused::after {
592-
border: 2px solid $datagrid-focused-border-color;
594+
border: 2px solid;
595+
border-color: $datagrid-focused-border-color;
593596
}
594597
}
595598
}
@@ -836,7 +839,8 @@ $generic-grid-base-cell-input-height: math.round($generic-base-line-height * $ge
836839

837840
& > td,
838841
& > tr:last-child > td {
839-
border-bottom: 1px solid $datagrid-focused-border-color;
842+
border-bottom: 1px solid;
843+
border-bottom-color: $datagrid-focused-border-color;
840844
}
841845

842846
&:not(.dx-row-lines) {

packages/devextreme-scss/scss/widgets/material/gridBase/_index.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,8 +1037,10 @@ $material-grid-base-group-panel-message-line-height: $material-button-text-line-
10371037
&:not(.dx-row-lines) {
10381038
& > td,
10391039
& > tr:first-child > td {
1040-
border-top: 1px solid $datagrid-focused-border-color;
1041-
border-bottom: 1px solid $datagrid-focused-border-color;
1040+
border-top: 1px solid;
1041+
border-bottom: 1px solid;
1042+
border-top-color: $datagrid-focused-border-color;
1043+
border-bottom-color: $datagrid-focused-border-color;
10421044
}
10431045
}
10441046
}

0 commit comments

Comments
 (0)