Skip to content

Commit 8342947

Browse files
committed
feat: new MD Progressbar
1 parent 2b14ae7 commit 8342947

5 files changed

Lines changed: 23 additions & 8 deletions

File tree

src/core/components/progressbar/progressbar-ios.less

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
.ios {
2-
.progressbar {
3-
span {
4-
border-radius: inherit;
5-
}
6-
}
72
.progressbar-infinite {
83
&:before {
94
animation: ios-progressbar-infinite 1s linear infinite;

src/core/components/progressbar/progressbar-md.less

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
@blue: #2196f3;
44
@green: #4caf50;
55
@yellow: #ffeb3b;
6+
.progressbar:not(.progressbar-infinite) {
7+
&::after {
8+
content: '';
9+
position: absolute;
10+
width: var(--f7-progressbar-height);
11+
height: var(--f7-progressbar-height);
12+
border-radius: var(--f7-progressbar-border-radius);
13+
right: 0;
14+
top: 0;
15+
background: var(--f7-progressbar-progress-color, var(--f7-theme-color));
16+
}
17+
}
618
.progressbar-infinite {
719
&:before {
820
animation: md-progressbar-infinite-1 2s linear infinite;

src/core/components/progressbar/progressbar-vars.less

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
});
1616
.md-vars({
1717
--f7-progressbar-height: 4px;
18-
--f7-progressbar-border-radius: 0px;
18+
--f7-progressbar-border-radius: 4px;
19+
1920
});
2021
.md-color-vars({
21-
--f7-progressbar-bg-color: rgba(var(--f7-theme-color-rgb), 0.5);
22+
--f7-progressbar-bg-color: var(--f7-md-secondary-container);
2223
});

src/core/components/progressbar/progressbar.less

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
.progressbar {
1717
vertical-align: middle;
1818
span {
19+
border-radius: inherit;
1920
background-color: var(--f7-progressbar-progress-color, var(--f7-theme-color));
2021
width: 100%;
2122
height: 100%;
@@ -80,6 +81,11 @@ body,
8081
border-radius: 0 !important;
8182
transform-origin: center top !important;
8283
}
84+
> .progressbar {
85+
&::after {
86+
display: none;
87+
}
88+
}
8389
}
8490

8591
@keyframes progressbar-in {

src/core/components/range/range-vars.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
});
4141
.md-vars({
4242
--f7-range-size: 20px;
43-
--f7-range-bar-bg-color: var(--f7-md-secondary-container);
43+
4444
--f7-range-bar-size: 16px;
4545
--f7-range-bar-border-radius: 16px;
4646
--f7-range-knob-width: 16px;
@@ -58,6 +58,7 @@
5858
--f7-range-scale-label-offset: 4px;
5959
});
6060
.md-color-vars({
61+
--f7-range-bar-bg-color: var(--f7-md-secondary-container);
6162
--f7-range-knob-color: var(--f7-theme-color);
6263
--f7-range-label-text-color: var(--f7-md-on-primary);
6364
--f7-range-label-bg-color: var(--f7-theme-color);

0 commit comments

Comments
 (0)