Skip to content

Commit 4970d5d

Browse files
r-farkhutdinovRuslan Farkhutdinov
andauthored
ProgressBar: Update progressbar status paddings for Generic & Fluent (#30383)
Co-authored-by: Ruslan Farkhutdinov <[email protected]>
1 parent 573d351 commit 4970d5d

File tree

10 files changed

+21
-4
lines changed

10 files changed

+21
-4
lines changed
-23 Bytes
Loading
-442 Bytes
Loading
-505 Bytes
Loading
0 Bytes
Loading
0 Bytes
Loading

packages/devextreme-scss/scss/widgets/base/_progressBar.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
top: 0;
8181
left: 0;
8282
width: auto;
83-
height: 20px;
8483
font-size: 12px;
8584
}
8685

packages/devextreme-scss/scss/widgets/fluent/progressBar/_index.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,8 @@
7373
}
7474

7575
.dx-progressbar-status {
76-
margin-top: $progressbar-status-height;
76+
padding-top: $progressbar-status-margin-top;
7777
color: $progressbar-label-color;
78-
height: $progressbar-status-height;
7978

8079
.dx-progressbar .dx-position-right & {
8180
padding-top: 0;

packages/devextreme-scss/scss/widgets/fluent/progressBar/_sizes.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44

55
$progressbar-height: null !default;
66
$progressbar-border-radius: $base-border-radius !default;
7-
$progressbar-status-height: 16px !default;
7+
$progressbar-status-margin-top: null !default;
88
$progressbar-indeterminate-background-width: 90%;
99

1010
@if $size == "default" {
1111
$progressbar-height: 4px !default;
12+
$progressbar-status-margin-top: 12px !default;
1213
}
1314

1415
@else if $size == "compact" {
1516
$progressbar-height: 2px !default;
17+
$progressbar-status-margin-top: 8px !default;
1618
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@ $generic-progress-bar-border: 1px solid $progressbar-border-color;
2222
border-radius: $generic-progressbar-border-radius;
2323
}
2424

25+
.dx-progressbar-status {
26+
padding-top: $progressbar-status-padding-top;
27+
28+
.dx-progressbar .dx-position-right & {
29+
padding-top: 0;
30+
}
31+
}
32+
2533
.dx-progressbar-range {
2634
position: relative;
2735
border: 1px solid $progressbar-range-border-color;

packages/devextreme-scss/scss/widgets/generic/progressBar/_sizes.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,12 @@
22

33
// adduse
44

5+
$progressbar-status-padding-top: null !default;
6+
7+
@if $size == "default" {
8+
$progressbar-status-padding-top: 8px !default;
9+
}
10+
11+
@else if $size == "compact" {
12+
$progressbar-status-padding-top: 4px !default;
13+
}

0 commit comments

Comments
 (0)