reorganize progress bars docs

diff --git a/docs/components.html b/docs/components.html
index 2198145ecd377e7836da2e6c6d28495e5bd8700d..70900fc3a31bc25bdad28579c985326cf78b4fb7 100644 (file)
--- a/docs/components.html
+++ b/docs/components.html
@@ -1522,8 +1522,9 @@
           <div class="page-header">
             <h1>Progress bars</h1>
           </div>
+          <p class="lead">Provide up-to-date feedback on the progress of a workflow or action with simple yet flexible progress bars.</p>
 
-          <h2>Examples and markup</h2>
+          <p>Progress bars use CSS3 transitions and animations to achieve some of their effects. These features are not supported in IE8-9 or older versions of Firefox. Internet Explorer 10 and below, as well as Opera 12, do not support animations.</p>
 
           <h3>Basic</h3>
           <p>Default progress bar with a vertical gradient.</p>
@@ -1538,55 +1539,6 @@
 &lt;/div&gt;
 </pre>
 
-          <h3>Striped</h3>
-          <p>Uses a gradient to create a striped effect. Not available in IE8.</p>
-          <div class="bs-docs-example">
-            <div class="progress progress-striped">
-              <div class="progress-bar" style="width: 20%;"></div>
-            </div>
-          </div>
-<pre class="prettyprint linenums">
-&lt;div class="progress progress-striped"&gt;
-  &lt;div class="progress-bar" style="width: 20%;"&gt;&lt;/div&gt;
-&lt;/div&gt;
-</pre>
-
-          <h3>Animated</h3>
-          <p>Add <code>.active</code> to <code>.progress-striped</code> to animate the stripes right to left. Not available in all versions of IE.</p>
-          <div class="bs-docs-example">
-            <div class="progress progress-striped active">
-              <div class="progress-bar" style="width: 45%"></div>
-            </div>
-          </div>
-<pre class="prettyprint linenums">
-&lt;div class="progress progress-striped active"&gt;
-  &lt;div class="progress-bar" style="width: 40%;"&gt;&lt;/div&gt;
-&lt;/div&gt;
-</pre>
-
-          <h3>Stacked</h3>
-          <p>Place multiple bars into the same <code>.progress</code> to stack them.</p>
-          <div class="bs-docs-example">
-            <div class="progress">
-              <div class="progress-bar progress-bar-success" style="width: 35%"></div>
-              <div class="progress-bar progress-bar-warning" style="width: 20%"></div>
-              <div class="progress-bar progress-bar-danger" style="width: 10%"></div>
-            </div>
-          </div>
-<pre class="prettyprint linenums">
-&lt;div class="progress"&gt;
-  &lt;div class="progress-bar progress-bar-success" style="width: 35%;"&gt;&lt;/div&gt;
-  &lt;div class="progress-bar progress-bar-warning" style="width: 20%;"&gt;&lt;/div&gt;
-  &lt;div class="progress-bar progress-bar-danger" style="width: 10%;"&gt;&lt;/div&gt;
-&lt;/div&gt;
-</pre>
-
-
-          <hr class="bs-docs-separator">
-
-
-          <h2>Options</h2>
-
           <h3>Additional colors</h3>
           <p>Progress bars use some of the same button and alert classes for consistent styles.</p>
           <div class="bs-docs-example">
@@ -1618,8 +1570,8 @@
 &lt;/div&gt;
 </pre>
 
-          <h3>Striped bars</h3>
-          <p>Similar to the solid colors, we have varied striped progress bars.</p>
+          <h3>Striped</h3>
+          <p>Uses a gradient to create a striped effect. Not available in IE8.</p>
           <div class="bs-docs-example">
             <div class="progress progress-striped" style="margin-bottom: 9px;">
               <div class="progress-bar progress-bar-info" style="width: 20%"></div>
@@ -1649,13 +1601,35 @@
 &lt;/div&gt;
 </pre>
 
+          <h3>Animated</h3>
+          <p>Add <code>.active</code> to <code>.progress-striped</code> to animate the stripes right to left. Not available in all versions of IE.</p>
+          <div class="bs-docs-example">
+            <div class="progress progress-striped active">
+              <div class="progress-bar" style="width: 45%"></div>
+            </div>
+          </div>
+<pre class="prettyprint linenums">
+&lt;div class="progress progress-striped active"&gt;
+  &lt;div class="progress-bar" style="width: 40%;"&gt;&lt;/div&gt;
+&lt;/div&gt;
+</pre>
 
-          <hr class="bs-docs-separator">
-
-
-          <h2>Browser support</h2>
-          <p>Progress bars use CSS3 gradients, transitions, and animations to achieve all their effects. These features are not supported in IE8-9 or older versions of Firefox.</p>
-          <p>Versions earlier than Internet Explorer 10 and Opera 12 do not support animations.</p>
+          <h3>Stacked</h3>
+          <p>Place multiple bars into the same <code>.progress</code> to stack them.</p>
+          <div class="bs-docs-example">
+            <div class="progress">
+              <div class="progress-bar progress-bar-success" style="width: 35%"></div>
+              <div class="progress-bar progress-bar-warning" style="width: 20%"></div>
+              <div class="progress-bar progress-bar-danger" style="width: 10%"></div>
+            </div>
+          </div>
+<pre class="prettyprint linenums">
+&lt;div class="progress"&gt;
+  &lt;div class="progress-bar progress-bar-success" style="width: 35%;"&gt;&lt;/div&gt;
+  &lt;div class="progress-bar progress-bar-warning" style="width: 20%;"&gt;&lt;/div&gt;
+  &lt;div class="progress-bar progress-bar-danger" style="width: 10%;"&gt;&lt;/div&gt;
+&lt;/div&gt;
+</pre>
 
         </section>
 

diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 18b1c4812a2ee01e87e883f2e0b761ac8021b8ae..c714bf70f6b7fc455cc3da3013ea77dd7dcd5137 100644 (file)
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1454,8 +1454,9 @@
           <div class="page-header">
             <h1>Progress bars</h1>
           </div>
+          <p class="lead">Provide up-to-date feedback on the progress of a workflow or action with simple yet flexible progress bars.</p>
 
-          <h2>Examples and markup</h2>
+          <p>Progress bars use CSS3 transitions and animations to achieve some of their effects. These features are not supported in IE8-9 or older versions of Firefox. Internet Explorer 10 and below, as well as Opera 12, do not support animations.</p>
 
           <h3>Basic</h3>
           <p>Default progress bar with a vertical gradient.</p>
@@ -1470,55 +1471,6 @@
 &lt;/div&gt;
 </pre>
 
-          <h3>Striped</h3>
-          <p>Uses a gradient to create a striped effect. Not available in IE8.</p>
-          <div class="bs-docs-example">
-            <div class="progress progress-striped">
-              <div class="progress-bar" style="width: 20%;"></div>
-            </div>
-          </div>
-<pre class="prettyprint linenums">
-&lt;div class="progress progress-striped"&gt;
-  &lt;div class="progress-bar" style="width: 20%;"&gt;&lt;/div&gt;
-&lt;/div&gt;
-</pre>
-
-          <h3>Animated</h3>
-          <p>Add <code>.active</code> to <code>.progress-striped</code> to animate the stripes right to left. Not available in all versions of IE.</p>
-          <div class="bs-docs-example">
-            <div class="progress progress-striped active">
-              <div class="progress-bar" style="width: 45%"></div>
-            </div>
-          </div>
-<pre class="prettyprint linenums">
-&lt;div class="progress progress-striped active"&gt;
-  &lt;div class="progress-bar" style="width: 40%;"&gt;&lt;/div&gt;
-&lt;/div&gt;
-</pre>
-
-          <h3>Stacked</h3>
-          <p>Place multiple bars into the same <code>.progress</code> to stack them.</p>
-          <div class="bs-docs-example">
-            <div class="progress">
-              <div class="progress-bar progress-bar-success" style="width: 35%"></div>
-              <div class="progress-bar progress-bar-warning" style="width: 20%"></div>
-              <div class="progress-bar progress-bar-danger" style="width: 10%"></div>
-            </div>
-          </div>
-<pre class="prettyprint linenums">
-&lt;div class="progress"&gt;
-  &lt;div class="progress-bar progress-bar-success" style="width: 35%;"&gt;&lt;/div&gt;
-  &lt;div class="progress-bar progress-bar-warning" style="width: 20%;"&gt;&lt;/div&gt;
-  &lt;div class="progress-bar progress-bar-danger" style="width: 10%;"&gt;&lt;/div&gt;
-&lt;/div&gt;
-</pre>
-
-
-          <hr class="bs-docs-separator">
-
-
-          <h2>Options</h2>
-
           <h3>Additional colors</h3>
           <p>Progress bars use some of the same button and alert classes for consistent styles.</p>
           <div class="bs-docs-example">
@@ -1550,8 +1502,8 @@
 &lt;/div&gt;
 </pre>
 
-          <h3>Striped bars</h3>
-          <p>Similar to the solid colors, we have varied striped progress bars.</p>
+          <h3>Striped</h3>
+          <p>Uses a gradient to create a striped effect. Not available in IE8.</p>
           <div class="bs-docs-example">
             <div class="progress progress-striped" style="margin-bottom: 9px;">
               <div class="progress-bar progress-bar-info" style="width: 20%"></div>
@@ -1581,13 +1533,35 @@
 &lt;/div&gt;
 </pre>
 
+          <h3>Animated</h3>
+          <p>Add <code>.active</code> to <code>.progress-striped</code> to animate the stripes right to left. Not available in all versions of IE.</p>
+          <div class="bs-docs-example">
+            <div class="progress progress-striped active">
+              <div class="progress-bar" style="width: 45%"></div>
+            </div>
+          </div>
+<pre class="prettyprint linenums">
+&lt;div class="progress progress-striped active"&gt;
+  &lt;div class="progress-bar" style="width: 40%;"&gt;&lt;/div&gt;
+&lt;/div&gt;
+</pre>
 
-          <hr class="bs-docs-separator">
-
-
-          <h2>Browser support</h2>
-          <p>Progress bars use CSS3 gradients, transitions, and animations to achieve all their effects. These features are not supported in IE8-9 or older versions of Firefox.</p>
-          <p>Versions earlier than Internet Explorer 10 and Opera 12 do not support animations.</p>
+          <h3>Stacked</h3>
+          <p>Place multiple bars into the same <code>.progress</code> to stack them.</p>
+          <div class="bs-docs-example">
+            <div class="progress">
+              <div class="progress-bar progress-bar-success" style="width: 35%"></div>
+              <div class="progress-bar progress-bar-warning" style="width: 20%"></div>
+              <div class="progress-bar progress-bar-danger" style="width: 10%"></div>
+            </div>
+          </div>
+<pre class="prettyprint linenums">
+&lt;div class="progress"&gt;
+  &lt;div class="progress-bar progress-bar-success" style="width: 35%;"&gt;&lt;/div&gt;
+  &lt;div class="progress-bar progress-bar-warning" style="width: 20%;"&gt;&lt;/div&gt;
+  &lt;div class="progress-bar progress-bar-danger" style="width: 10%;"&gt;&lt;/div&gt;
+&lt;/div&gt;
+</pre>
 
         </section>