Merge remote-tracking branch 'upstream/master' into node-requirable

Conflicts:
	Gruntfile.js

1 files changed, 18 insertions, 7 deletions

diff --git a/less/progress-bars.less b/less/progress-bars.less
index 74b702843..d5fbfb7db 100644
--- a/less/progress-bars.less
+++ b/less/progress-bars.less
@@ -6,6 +6,13 @@
 // Bar animations
 // -------------------------
 
+// WebKit
+@-webkit-keyframes progress-bar-stripes {
+  from  { background-position: 40px 0; }
+  to    { background-position: 0 0; }
+}
+
+// Spec and IE10+
 @keyframes progress-bar-stripes {
   from  { background-position: 40px 0; }
   to    { background-position: 0 0; }
@@ -41,23 +48,27 @@
 }
 
 // Striped bars
-.progress-striped .progress-bar {
+//
+// `.progress-striped .progress-bar` is deprecated as of v3.2.0 in favor of the
+// `.progress-bar-striped` class, which you just add to an existing
+// `.progress-bar`.
+.progress-striped .progress-bar,
+.progress-bar-striped {
   #gradient > .striped();
   background-size: 40px 40px;
 }
 
 // Call animation for the active one
-.progress.active .progress-bar {
+//
+// `.progress.active .progress-bar` is deprecated as of v3.2.0 in favor of the
+// `.progress-bar.active` approach.
+.progress.active .progress-bar,
+.progress-bar.active {
   .animation(progress-bar-stripes 2s linear infinite);
 }
 
 // Account for lower percentages
 .progress-bar {
-  &[aria-valuenow="1"],
-  &[aria-valuenow="2"] {
-    min-width: 30px;
-  }
-
   &[aria-valuenow="0"] {
     color: @gray-light;
     min-width: 30px;