Merge branch '3.0.0-wip' into bs3_homepage

1 files changed, 8 insertions, 18 deletions

diff --git a/less/progress-bars.less b/less/progress-bars.less
index fe399abf7..49e5df8e3 100644
--- a/less/progress-bars.less
+++ b/less/progress-bars.less
@@ -18,19 +18,13 @@
   to    { background-position: 0 0; }
 }
 
-// IE9
-@-ms-keyframes progress-bar-stripes {
-  from  { background-position: 40px 0; }
-  to    { background-position: 0 0; }
-}
-
 // Opera
 @-o-keyframes progress-bar-stripes {
   from  { background-position: 0 0; }
   to    { background-position: 40px 0; }
 }
 
-// Spec
+// Spec and IE10+
 @keyframes progress-bar-stripes {
   from  { background-position: 40px 0; }
   to    { background-position: 0 0; }
@@ -67,7 +61,7 @@
 // Striped bars
 .progress-striped .progress-bar {
   #gradient > .striped(@progress-bar-bg);
-  .background-size(40px 40px);
+  background-size: 40px 40px;
 }
 
 // Call animation for the active one
@@ -84,22 +78,18 @@
 // Variations
 // -------------------------
 
-// Danger (red)
-.progress-bar-danger {
-  .progress-bar-variant(@progress-bar-danger-bg);
-}
-
-// Success (green)
 .progress-bar-success {
   .progress-bar-variant(@progress-bar-success-bg);
 }
 
-// Warning (orange)
+.progress-bar-info {
+  .progress-bar-variant(@progress-bar-info-bg);
+}
+
 .progress-bar-warning {
   .progress-bar-variant(@progress-bar-warning-bg);
 }
 
-// Info (teal)
-.progress-bar-info {
-  .progress-bar-variant(@progress-bar-info-bg);
+.progress-bar-danger {
+  .progress-bar-variant(@progress-bar-danger-bg);
 }