aboutsummaryrefslogtreecommitdiff
path: root/docs/components.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-07 13:52:36 -0800
committerMark Otto <[email protected]>2012-01-07 13:52:36 -0800
commit418e2c7d58d9fc6a126a58427b14a2cf68f97423 (patch)
treea9b427a23796162fd8ec3a79e85023931b2970ec /docs/components.html
parentb81b0e2b15abf4068f55d0055a10c8f5a16aece8 (diff)
parent3eb80591b2c8bb2850caf27da7d6b8c8b747063a (diff)
downloadbootstrap-418e2c7d58d9fc6a126a58427b14a2cf68f97423.tar.xz
bootstrap-418e2c7d58d9fc6a126a58427b14a2cf68f97423.zip
Merge branch '2.0-wip' of https://github.com/pokonski/bootstrap into pokonski-2.0-wip
Conflicts: bootstrap.css
Diffstat (limited to 'docs/components.html')
-rw-r--r--docs/components.html41
1 files changed, 41 insertions, 0 deletions
diff --git a/docs/components.html b/docs/components.html
index baeccd6ed..8be1f824a 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -925,6 +925,47 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="bottom">ipsum</a> verit
</div><!-- /row -->
</section>
+<!-- Progress bars
+================================================== -->
+ <section id="progresss">
+ <div class="page-header">
+ <h1>Progress bars <small>... for indicating progress</small></h1>
+ </div>
+ <div class="row">
+ <div class="span3">
+ <h2>Basic bars</h2>
+ <p>Default look of progress bars. Absolute minimum.</p>
+ </div>
+ <div class="span9">
+ <div class="progress">
+ <div class="bar" style="width: 50%;"></div>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="span3">
+ <h2>Striped bars</h2>
+ <p>Bars with stripes painted.</p>
+ </div>
+ <div class="span9">
+ <div class="progress info striped">
+ <div class="bar" style="width: 20%;"></div>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="span3">
+ <h2>Active state</h2>
+ <p>Animated stripes! <small>Not on Opera, though :(</small></p>
+ </div>
+ <div class="span3">
+ <div class="progress danger active striped">
+ <div class="bar" style="width: 45%"></div>
+ </div>
+ </div>
+ </div>
+ </section>
+
<!-- Footer
================================================== -->
<footer class="footer">