aboutsummaryrefslogtreecommitdiff
path: root/scss/_progress.scss
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-10-16 19:46:47 -0700
committerMark Otto <[email protected]>2016-10-16 19:46:47 -0700
commitb4cdccba84f7681e2911d307828c5ce94c856736 (patch)
treef8e1edddbd941adb255766889019248ffa399d0a /scss/_progress.scss
parent05bdecd0b09a007ae949f49fdff9006650c06969 (diff)
parent6d6538fc81ebdb9e29ca5a5a4e8e5768b9358fe9 (diff)
downloadbootstrap-b4cdccba84f7681e2911d307828c5ce94c856736.tar.xz
bootstrap-b4cdccba84f7681e2911d307828c5ce94c856736.zip
Merge branch 'v4-dev' into v4-navbars
Diffstat (limited to 'scss/_progress.scss')
-rw-r--r--scss/_progress.scss20
1 files changed, 10 insertions, 10 deletions
diff --git a/scss/_progress.scss b/scss/_progress.scss
index b2bcb3056..c2364feee 100644
--- a/scss/_progress.scss
+++ b/scss/_progress.scss
@@ -26,7 +26,7 @@
// Reset the default appearance
appearance: none;
// Set overall border radius
- @include border-radius($border-radius);
+ @include border-radius($progress-border-radius);
}
// Filled-in portion of the bar
@@ -37,30 +37,30 @@
}
.progress[value]::-moz-progress-bar {
background-color: $progress-bar-color;
- @include border-left-radius($border-radius);
+ @include border-left-radius($progress-border-radius);
}
.progress[value]::-webkit-progress-value {
background-color: $progress-bar-color;
- @include border-left-radius($border-radius);
+ @include border-left-radius($progress-border-radius);
}
// Tweaks for full progress bar
.progress[value="100"]::-moz-progress-bar {
- @include border-right-radius($border-radius);
+ @include border-right-radius($progress-border-radius);
}
.progress[value="100"]::-webkit-progress-value {
- @include border-right-radius($border-radius);
+ @include border-right-radius($progress-border-radius);
}
// Unfilled portion of the bar
.progress[value]::-webkit-progress-bar {
background-color: $progress-bg;
- @include border-radius($border-radius);
+ @include border-radius($progress-border-radius);
@include box-shadow($progress-box-shadow);
}
base::-moz-progress-bar, // Absurd-but-syntactically-valid selector to make these styles Firefox-only
.progress[value] {
background-color: $progress-bg;
- @include border-radius($border-radius);
+ @include border-radius($progress-border-radius);
@include box-shadow($progress-box-shadow);
}
@@ -68,7 +68,7 @@ base::-moz-progress-bar, // Absurd-but-syntactically-valid selector to make thes
@media screen and (min-width:0\0) {
.progress {
background-color: $progress-bg;
- @include border-radius($border-radius);
+ @include border-radius($progress-border-radius);
@include box-shadow($progress-box-shadow);
}
.progress-bar {
@@ -76,10 +76,10 @@ base::-moz-progress-bar, // Absurd-but-syntactically-valid selector to make thes
height: $spacer-y;
text-indent: -999rem; // Simulate hiding of value as in native `<progress>`
background-color: $progress-bar-color;
- @include border-left-radius($border-radius);
+ @include border-left-radius($progress-border-radius);
}
.progress[width="100%"] {
- @include border-right-radius($border-radius);
+ @include border-right-radius($progress-border-radius);
}
}