Skip to content

Commit 1e435d8

Browse files
authored
Merge pull request #94 from ovh-ux/fix/progress
fix(progress): fix progress bugs and design
2 parents 8705186 + 13bb090 commit 1e435d8

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

packages/oui-progress/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@ oui-progress is a package which provide styles for the progress component.
6262
### Thresholds
6363

6464
```html:preview
65+
<div class="oui-progress oui-progress_error">
66+
<div class="oui-progress__threshold" style="left: 70%"></div>
67+
<div class="oui-progress__bar oui-progress__bar_error oui-progress__bar_text-left" role="progressbar" style="width: 80%" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100">
68+
<span class="oui-progress__label">Progression: 80%</span>
69+
</div>
70+
</div>
6571
<div class="oui-progress oui-progress_info">
6672
<div class="oui-progress__threshold" style="left: 25%"></div>
6773
<div class="oui-progress__threshold" style="left: 50%"></div>

packages/oui-progress/_mixins.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
@height: @oui-progress-height,
6565
@force-radius: false
6666
) {
67-
position: relative;
6867
height: @height;
6968
text-align: right;
7069
transition: width @oui-animation-default-timing @oui-animation-default;
@@ -105,6 +104,7 @@
105104
font-size: @oui-progress-bar-text-font-size;
106105
font-weight: @oui-progress-bar-text-font-weight;
107106
line-height: @oui-progress-height;
107+
white-space: nowrap;
108108
}
109109

110110
.progress-bar-threshold() {
@@ -122,7 +122,7 @@
122122
height: @oui-progress-height;
123123
width: 1px;
124124
left: -1px;
125-
background-color: rgba(100, 100, 100, .5);
125+
background-color: rgba(100, 100, 100, .3);
126126
}
127127

128128
font-size: @oui-progress-bar-text-font-size;

packages/oui-progress/_variables.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Progress
22
@oui-progress-height: 23px;
33
@oui-progress-margin: rem-calc(10) 0;
4-
@oui-progress-bar-text-spacing: rem-calc(10);
4+
@oui-progress-bar-text-spacing: rem-calc(12);
55
@oui-progress-bar-text-font-size: rem-calc(16);
66
@oui-progress-bar-text-font-weight: 600;
77

0 commit comments

Comments
 (0)