diff options
| author | fat <[email protected]> | 2014-06-23 23:08:23 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2014-06-23 23:08:23 -0700 |
| commit | 0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3 (patch) | |
| tree | 7b88c388d526ada7b564f1faf44cda92276f2722 /docs/examples/theme | |
| parent | f071549c8408241b88a95192e477816d2402eb6e (diff) | |
| parent | b31c35b63629ec750f338a646f6b730bd675b734 (diff) | |
| download | bootstrap-0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3.tar.xz bootstrap-0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3.zip | |
Merge branch 'master' into fix-13386
Conflicts:
js/carousel.js
Diffstat (limited to 'docs/examples/theme')
| -rw-r--r-- | docs/examples/theme/index.html | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/examples/theme/index.html b/docs/examples/theme/index.html index 2916b2f3a..6b7e20406 100644 --- a/docs/examples/theme/index.html +++ b/docs/examples/theme/index.html @@ -486,6 +486,9 @@ <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="80" aria-valuemin="0" aria-valuemax="100" style="width: 80%"><span class="sr-only">80% Complete (danger)</span></div> </div> <div class="progress"> + <div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%"><span class="sr-only">100% Complete</span></div> + </div> + <div class="progress"> <div class="progress-bar progress-bar-success" style="width: 35%"><span class="sr-only">35% Complete (success)</span></div> <div class="progress-bar progress-bar-warning" style="width: 20%"><span class="sr-only">20% Complete (warning)</span></div> <div class="progress-bar progress-bar-danger" style="width: 10%"><span class='sr-only'>10% Complete (danger)</span></div> |