aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorPatrick H. Lauke <[email protected]>2015-12-10 22:29:54 +0000
committerPatrick H. Lauke <[email protected]>2015-12-11 08:58:11 +0000
commit97461a51a2dbcdc781f75b7f9bcb95d0e5ce8716 (patch)
treee1331acb2f50279deee49b1b0bc9735f70ab94f4 /scss
parentd5b57c3c4d69dc9afd2036d9d4c0e10e52121391 (diff)
downloadbootstrap-97461a51a2dbcdc781f75b7f9bcb95d0e5ce8716.tar.xz
bootstrap-97461a51a2dbcdc781f75b7f9bcb95d0e5ce8716.zip
progress bar for IE10+/Edge (radius, use ::-ms-fill, add variant mixins, striped support)
Diffstat (limited to 'scss')
-rw-r--r--scss/_progress.scss15
-rw-r--r--scss/mixins/_progress.scss5
2 files changed, 18 insertions, 2 deletions
diff --git a/scss/_progress.scss b/scss/_progress.scss
index 61e13b052..382307b45 100644
--- a/scss/_progress.scss
+++ b/scss/_progress.scss
@@ -19,12 +19,19 @@
margin-bottom: $spacer-y;
}
.progress[value] {
- // IE10 uses `color` to set the bar background-color
- color: #0074d9;
+ // Set overall background
+ background-color: #eee;
// Remove Firefox and Opera border
border: 0;
// Reset the default appearance
appearance: none;
+ // Set overall border radius
+ @include border-radius($border-radius);
+}
+.progress[value]::-ms-fill {
+ background-color: #0074d9;
+ // Remove right-hand border of value bar from IE10+/Edge
+ border: 0;
}
.progress[value]::-webkit-progress-bar {
background-color: #eee;
@@ -111,6 +118,10 @@
@include gradient-striped();
background-size: $spacer-y $spacer-y;
}
+.progress-striped[value]::-ms-fill {
+ @include gradient-striped();
+ background-size: $spacer-y $spacer-y;
+}
// IE9
@media screen and (min-width:0\0) {
.progress-bar-striped {
diff --git a/scss/mixins/_progress.scss b/scss/mixins/_progress.scss
index e174141dc..9622d790b 100644
--- a/scss/mixins/_progress.scss
+++ b/scss/mixins/_progress.scss
@@ -9,6 +9,11 @@
background-color: $color;
}
+ // IE10+, Microsoft Edge
+ &[value]::-ms-fill {
+ background-color: $color;
+ }
+
// IE9
@media screen and (min-width:0\0) {
.progress-bar {