aboutsummaryrefslogtreecommitdiff
path: root/docs/components.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-08-20 11:13:07 -0700
committerMark Otto <[email protected]>2012-08-20 11:13:07 -0700
commit47697c5f352c08294fb8a077e1ab27dce7decdb9 (patch)
tree361d87fee660f59842bc332d6cc13d7bea76894c /docs/components.html
parentafaee0ca136033811f48cefc6873fc62fee02923 (diff)
parenta1951ed7c08bbaad37e323b460f440d9598d364e (diff)
downloadbootstrap-47697c5f352c08294fb8a077e1ab27dce7decdb9.tar.xz
bootstrap-47697c5f352c08294fb8a077e1ab27dce7decdb9.zip
Merge branch 'progress-multi-2.1.0-wip' of https://github.com/jpommerening/bootstrap into jpommerening-progress-multi-2.1.0-wip
Diffstat (limited to 'docs/components.html')
-rw-r--r--docs/components.html20
1 files changed, 20 insertions, 0 deletions
diff --git a/docs/components.html b/docs/components.html
index e4bb55188..0eb929d83 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -2067,6 +2067,26 @@
&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="bar-success" style="width: 35%"></div>
+ <div class="bar-warning" style="width: 20%"></div>
+ <div class="bar-danger" style="width: 10%"></div>
+ </div>
+ </div>
+<pre class="prettyprint linenums">
+&lt;div class="progress"&gt;
+ &lt;div class="bar-success"
+ style="width: 35%;"&gt;&lt;/div&gt;
+ &lt;div class="bar-warning"
+ style="width: 20%;"&gt;&lt;/div&gt;
+ &lt;div class="bar-danger"
+ style="width: 10%;"&gt;&lt;/div&gt;
+&lt;/div&gt;
+</pre>
+
<hr class="bs-docs-separator">