2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00

Merge branch '2.0-wip' of https://github.com/pokonski/bootstrap into pokonski-2.0-wip

Conflicts:
	bootstrap.css
This commit is contained in:
Mark Otto
2012-01-07 13:52:36 -08:00
7 changed files with 388 additions and 1 deletions
+41
View File
@@ -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">