Skip to content

Commit 699d544

Browse files
VasilyStrelyaevVasilyStrelyaev
committed
split shorthand properties
1 parent 242c3aa commit 699d544

108 files changed

Lines changed: 1067 additions & 608 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/devextreme-scss/scss/widgets/base/_sortable.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ $base-accent: null !default;
3838
position: absolute;
3939
top: 0;
4040
left: 0;
41-
border: 1px solid $base-accent;
41+
border: 1px solid;
42+
border-color: $base-accent;
4243
box-sizing: border-box;
4344
z-index: $max-integer;
4445
}

‎packages/devextreme-scss/scss/widgets/base/calendar/_mixins.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@
152152

153153
&.dx-calendar-today {
154154
span {
155-
border: 2px solid $base-accent;
155+
border: 2px solid;
156+
border-color: $base-accent;
156157
}
157158
}
158159

‎packages/devextreme-scss/scss/widgets/base/cardView/content_view/content/card/_index.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
width: 100%;
88
min-width: var(--dx-cardview-card-min-width, $cardview-card-min-width);
99
max-width: var(--dx-cardview-card-max-width);
10-
border: $cardview-card-border-width solid $cardview-card-border-color;
10+
border: $cardview-card-border-width solid;
11+
border-color: $cardview-card-border-color;
1112
border-radius: $cardview-card-border-radius;
1213
background-color: $cardview-card-bg-color;
1314
color: $cardview-card-text-color;

‎packages/devextreme-scss/scss/widgets/base/cardView/content_view/content/card/content/_index.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
grid-template-columns: auto 1fr;
88
row-gap: $cardview-card__content-row-gap;
99
width: 100%;
10-
border-top: $cardview-card-border-width solid $cardview-card-divider-color;
10+
border-top: $cardview-card-border-width solid;
11+
border-top-color: $cardview-card-divider-color;
1112

1213
// NOTE: Override default fonts only in "material-compact"
1314
font-size: $cardview-card__content-font-size;

‎packages/devextreme-scss/scss/widgets/base/cardView/content_view/content/card/cover/_index.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
overflow: hidden;
66
display: flex;
77
justify-content: center;
8-
border-top: $cardview-card-border-width solid $cardview-card-divider-color;
8+
border-top: $cardview-card-border-width solid;
9+
border-top-color: $cardview-card-divider-color;
910
max-height: var(--dx-cardview-card-cover-max-height);
1011
aspect-ratio: var(--dx-cardview-card-cover-ratio);
1112
width: 100%;

‎packages/devextreme-scss/scss/widgets/base/cardView/header_panel/_index.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ $sortable-side-offset: 6px;
9898
}
9999

100100
.dx-cardview-header-item-sort-indicator {
101-
border: $cardview-header-item__sort-indicator__border-size solid $cardview-header-item__sort-indicator__border-color;
101+
border: $cardview-header-item__sort-indicator__border-size solid;
102+
border-color: $cardview-header-item__sort-indicator__border-color;
102103
border-radius: $cardview-header-item__sort-indicator__border-radius;
103104
}
104105

‎packages/devextreme-scss/scss/widgets/base/chat/layout/chat/_mixins.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
) {
66
.dx-chat {
77
background-color: $background-color;
8-
border: 1px solid $border-color;
8+
border: 1px solid;
9+
border-color: $border-color;
910
border-radius: $border-radius;
1011
}
1112
}

‎packages/devextreme-scss/scss/widgets/base/colorView/_mixins.scss‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
}
66

77
.dx-colorview-hue-scale-handle {
8-
border: 1px solid $handle-border-color;
8+
border: 1px solid;
9+
border-color: $handle-border-color;
910
box-shadow: inset -5px 0 0 3px $handle-color, inset 5px 0 0 3px $handle-color, inset -6px 0 1px 4px $handle-border-color, inset 6px 0 1px 4px $handle-border-color;
1011
}
1112

1213
.dx-colorview-alpha-channel-handle {
13-
border: 1px solid $handle-border-color;
14+
border: 1px solid;
15+
border-color: $handle-border-color;
1416
box-shadow: inset 0 -5px 0 3px $handle-color, inset 0 5px 0 3px $handle-color, inset 0 -6px 1px 4px $handle-border-color, inset 0 6px 1px 4px $handle-border-color;
1517
}
1618
}

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

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,31 @@ $datagrid-text-stub-background-image-path: null !default;
2222
> .dx-datagrid-rowsview,
2323
> .dx-datagrid-total-footer {
2424
border-left: $datagrid-border;
25+
border-left-color: $datagrid-border-color;
2526
border-right: $datagrid-border;
27+
border-right-color: $datagrid-border-color;
2628
}
2729

2830
> .dx-datagrid-rowsview,
2931
> .dx-datagrid-total-footer {
3032
border-bottom: $datagrid-border;
33+
border-bottom-color: $datagrid-border-color;
3134
}
3235

3336
> .dx-datagrid-headers,
3437
> .dx-datagrid-filter-panel {
3538
border-top: $datagrid-border;
39+
border-top-color: $datagrid-border-color;
3640
}
3741

3842
> .dx-datagrid-filter-panel {
3943
border-top-width: 0;
4044
border-left: $datagrid-border;
45+
border-left-color: $datagrid-border-color;
4146
border-right: $datagrid-border;
47+
border-right-color: $datagrid-border-color;
4248
border-bottom: $datagrid-border;
49+
border-bottom-color: $datagrid-border-color;
4350
}
4451
}
4552

@@ -159,8 +166,10 @@ $datagrid-text-stub-background-image-path: null !default;
159166
.dx-datagrid-rowsview .dx-header-row,
160167
.dx-datagrid-headers .dx-row {
161168
td.dx-pointer-events-none {
162-
border-left: 2px solid $datagrid-border-color;
163-
border-right: 2px solid $datagrid-border-color;
169+
border-left: 2px solid;
170+
border-left-color: $datagrid-border-color;
171+
border-right: 2px solid;
172+
border-right-color: $datagrid-border-color;
164173

165174
&.dx-first-cell {
166175
border-left: none;
@@ -288,11 +297,13 @@ $datagrid-text-stub-background-image-path: null !default;
288297

289298
.dx-header-multi-row.dx-datagrid-sticky-columns .dx-column-lines > td:first-child {
290299
border-left: $datagrid-border;
300+
border-left-color: $datagrid-border-color;
291301
}
292302

293303
.dx-datagrid-filter-panel {
294304
color: $datagrid-base-color;
295305
border-top: $datagrid-border;
306+
border-top-color: $datagrid-border-color;
296307

297308
.dx-icon-filter,
298309
.dx-datagrid-filter-panel-text,
@@ -342,8 +353,10 @@ $datagrid-text-stub-background-image-path: null !default;
342353
.dx-datagrid-rowsview .dx-header-row,
343354
.dx-datagrid-headers .dx-row {
344355
td.dx-pointer-events-none {
345-
border-left: 2px solid $datagrid-border-color;
346-
border-right: 2px solid $datagrid-border-color;
356+
border-left: 2px solid;
357+
border-left-color: $datagrid-border-color;
358+
border-right: 2px solid;
359+
border-right-color: $datagrid-border-color;
347360

348361
&.dx-first-cell {
349362
border-right: none;
@@ -371,6 +384,7 @@ $datagrid-text-stub-background-image-path: null !default;
371384
&:first-child {
372385
border-right: none;
373386
border-left: $datagrid-border;
387+
border-left-color: $datagrid-border-color;
374388
}
375389

376390
&:last-child {
@@ -386,6 +400,7 @@ $datagrid-text-stub-background-image-path: null !default;
386400

387401
&:not(.dx-datagrid-group-footer) > td {
388402
border-right: $datagrid-border;
403+
border-right-color: $datagrid-border-color;
389404

390405
&:first-child {
391406
border-right: none;
@@ -399,7 +414,8 @@ $datagrid-text-stub-background-image-path: null !default;
399414
border-right: none;
400415

401416
&.dx-datagrid-sticky-column-border-left {
402-
border-left: 2px solid $datagrid-border-color;
417+
border-left: 2px solid;
418+
border-left-color: $datagrid-border-color;
403419
}
404420
}
405421
}
@@ -410,6 +426,7 @@ $datagrid-text-stub-background-image-path: null !default;
410426
.dx-column-lines > td:first-child {
411427
border-left: none;
412428
border-right: $datagrid-border;
429+
border-right-color: $datagrid-border-color;
413430
}
414431
}
415432

@@ -427,11 +444,13 @@ $datagrid-text-stub-background-image-path: null !default;
427444
.dx-datagrid-sticky-columns .dx-datagrid-table {
428445
.dx-row {
429446
td.dx-datagrid-sticky-column-border-right {
430-
border-right: 2px solid $datagrid-border-color;
447+
border-right: 2px solid;
448+
border-right-color: $datagrid-border-color;
431449
}
432450

433451
td.dx-datagrid-sticky-column-border-left {
434-
border-left: 2px solid $datagrid-border-color;
452+
border-left: 2px solid;
453+
border-left-color: $datagrid-border-color;
435454
}
436455
}
437456
}

0 commit comments

Comments
 (0)