diff options
| author | Mark Otto <[email protected]> | 2014-07-11 00:38:28 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-11 00:38:28 -0700 |
| commit | cabb86d126584f48651431f431070dcf6bd9d76f (patch) | |
| tree | e6f2e8c5d7ba7fabdd54f48ac124466ffa308d62 /docs/examples/theme | |
| parent | f6482aadcd8498f2dc82907994f8ec69afec8613 (diff) | |
| parent | c3ae289f4a9e5fc14e489e3914d150954469f1ac (diff) | |
| download | bootstrap-cabb86d126584f48651431f431070dcf6bd9d76f.tar.xz bootstrap-cabb86d126584f48651431f431070dcf6bd9d76f.zip | |
Merge branch 'master' into derp
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
docs/_includes/components/progress-bars.html
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
Diffstat (limited to 'docs/examples/theme')
| -rw-r--r-- | docs/examples/theme/index.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/examples/theme/index.html b/docs/examples/theme/index.html index d66874eb8..54bf85346 100644 --- a/docs/examples/theme/index.html +++ b/docs/examples/theme/index.html @@ -476,7 +476,7 @@ <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 class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%"><span class="sr-only">60% 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> |