diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 29d217092b..069beaf06d 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 330c57f964..5ec2dba8e0 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3480,7 +3480,7 @@ a.thumbnail:hover { transition: width 0.6s ease; } .progress-striped .bar { - background-color: #62c462; + background-color: #149bdf; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); diff --git a/docs/components.html b/docs/components.html index 857a28c5fc..bb3d4c05c8 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1730,12 +1730,11 @@

Striped

Uses a gradient to create a striped effect.

-
+ 
-<div class="progress progress-info
-     progress-striped">
+<div class="progress progress-striped">
   <div class="bar"
        style="width: 20%;"></div>
 </div>
@@ -1744,12 +1743,12 @@
     

       
Animated

       
Takes the striped example and animates it.

-      

+      

         

       

 
-<div class="progress progress-danger
-     progress-striped active">
+<div class="progress progress-striped
+     active">
   <div class="bar"
        style="width: 40%;"></div>
 </div>
@@ -1759,23 +1758,44 @@
 
   
Options and browser support

   

-    

+    

       
Additional colors

-      
Progress bars utilize some of the same class names as buttons and alerts for similar styling.

-      
    
-        
  • .progress-info
    • 
-        
  • .progress-success
    • 
-        
  • .progress-warning
    • 
-        
  • .progress-danger
    • 
-      

-      
Alternatively, you can customize the LESS files and roll your own colors and sizes.

+      
Progress bars use some of the same button and alert classes for consistent styles.

+      

+        

+      

+      

+        

+      

+      

+        

+      

+      

+        

+      

     

-    

+     

+      
Striped bars

+      
Similar to the solid colors, we have varied striped progress bars.

+      

+        

+      

+      

+        

+      

+      

+        

+      

+      

+        

+      

+    

+    

       
Behavior

       
Progress bars use CSS3 transitions, so if you dynamically adjust the width via javascript, it will smoothly resize.

       
If you use the .active class, your .progress-striped progress bars will animate the stripes left to right.

     

-    

+    

       
Browser support

       
Progress bars use CSS3 gradients, transitions, and animations to achieve all their effects. These features are not supported in IE7-8 or older versions of Firefox.

       
Opera does not support animations at this time.

diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index ab7dab761e..18b0f7ce47 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1654,12 +1654,11 @@
     

       
{{_i}}Striped{{/i}}

       
{{_i}}Uses a gradient to create a striped effect.{{/i}}

-      

+      

         

       

 
-<div class="progress progress-info
-     progress-striped">
+<div class="progress progress-striped">
   <div class="bar"
        style="width: 20%;"></div>
 </div>
@@ -1668,12 +1667,12 @@
     

       
{{_i}}Animated{{/i}}

       
{{_i}}Takes the striped example and animates it.{{/i}}

-      

+      

         

       

 
-<div class="progress progress-danger
-     progress-striped active">
+<div class="progress progress-striped
+     active">
   <div class="bar"
        style="width: 40%;"></div>
 </div>
@@ -1683,23 +1682,44 @@
 
   
{{_i}}Options and browser support{{/i}}

   

-    

+    

       
{{_i}}Additional colors{{/i}}

-      
{{_i}}Progress bars utilize some of the same class names as buttons and alerts for similar styling.{{/i}}

-      
    
-        
  • .progress-info
    • 
-        
  • .progress-success
    • 
-        
  • .progress-warning
    • 
-        
  • .progress-danger
    • 
-      

-      
{{_i}}Alternatively, you can customize the LESS files and roll your own colors and sizes.{{/i}}

+      
{{_i}}Progress bars use some of the same button and alert classes for consistent styles.{{/i}}

+      

+        

+      

+      

+        

+      

+      

+        

+      

+      

+        

+      

     

-    

+     

+      
{{_i}}Striped bars{{/i}}

+      
{{_i}}Similar to the solid colors, we have varied striped progress bars.{{/i}}

+      

+        

+      

+      

+        

+      

+      

+        

+      

+      

+        

+      

+    

+    

       
{{_i}}Behavior{{/i}}

       
{{_i}}Progress bars use CSS3 transitions, so if you dynamically adjust the width via javascript, it will smoothly resize.{{/i}}

       
{{_i}}If you use the .active class, your .progress-striped progress bars will animate the stripes left to right.{{/i}}

     

-    

+    

       
{{_i}}Browser support{{/i}}

       
{{_i}}Progress bars use CSS3 gradients, transitions, and animations to achieve all their effects. These features are not supported in IE7-8 or older versions of Firefox.{{/i}}

       
{{_i}}Opera does not support animations at this time.{{/i}}

diff --git a/less/progress-bars.less b/less/progress-bars.less
index dba698c77f..a99b118a03 100644
--- a/less/progress-bars.less
+++ b/less/progress-bars.less
@@ -54,7 +54,7 @@
 
 // Striped bars
 .progress-striped .bar {
-  #gradient > .striped(#62c462);
+  #gradient > .striped(#149bdf);
   .background-size(40px 40px);
 }