diff options
| author | Mark Otto <[email protected]> | 2013-08-18 10:28:32 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 10:28:32 -0700 |
| commit | f8b65b41ab0c1bc130c3ca521fb99214f5509568 (patch) | |
| tree | 0b117fe251e09d6917c5e777c4735574da127617 /components.html | |
| parent | 6b24297c5beca5adc118d0524c50700928687c1c (diff) | |
| parent | 6496ffb7d4fc042983882af8dadce39b1d7affac (diff) | |
| download | bootstrap-f8b65b41ab0c1bc130c3ca521fb99214f5509568.tar.xz bootstrap-f8b65b41ab0c1bc130c3ca521fb99214f5509568.zip | |
Merge branch '3.0.0-wip' into bs3_restore_glyphicons
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'components.html')
| -rw-r--r-- | components.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components.html b/components.html index d7f791b84..4e531e6a8 100644 --- a/components.html +++ b/components.html @@ -2287,7 +2287,7 @@ body { padding-bottom: 70px; } </div> <h3 id="progress-basic">Basic example</h3> - <p>Default progress bar with a vertical gradient.</p> + <p>Default progress bar.</p> <div class="bs-example"> <div class="progress"> <div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;"><span class="sr-only">60% Complete</span></div> |