diff options
| author | Mark Otto <[email protected]> | 2013-09-01 21:55:59 +0200 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-01 21:55:59 +0200 |
| commit | 26727bfefd46059a6ce66be7ed0e54910870efd9 (patch) | |
| tree | 6d9d7fb12fd1fbfe454b5df26899d5079c385b8a | |
| parent | b45c3ea6479e5129f13ab2100b7fffe984c5a935 (diff) | |
| parent | 93694898838b479d2806c53c827847f724312bcc (diff) | |
| download | bootstrap-26727bfefd46059a6ce66be7ed0e54910870efd9.tar.xz bootstrap-26727bfefd46059a6ce66be7ed0e54910870efd9.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
| -rw-r--r-- | getting-started.html | 10 | ||||
| -rw-r--r-- | less/grid.less | 8 |
2 files changed, 13 insertions, 5 deletions
diff --git a/getting-started.html b/getting-started.html index 6b5f0e4f1..1c864676b 100644 --- a/getting-started.html +++ b/getting-started.html @@ -434,6 +434,14 @@ bootstrap/ <td><code>.text-error</code></td> <td><code>.text-danger</code></td> </tr> + <tr> + <td><code>.bar</code></td> + <td><code>.progress-bar</code></td> + </tr> + <tr> + <td><code>.bar-*</code></td> + <td><code>.progress-bar-*</code></td> + </tr> </tbody> </table> </div><!-- /.table-responsive --> @@ -467,7 +475,7 @@ bootstrap/ <td><code>.jumbotron</code></td> </tr> <tr> - <td>Tiny grid (<768px)</td> + <td>Extra small grid (<768px)</td> <td><code>.col-xs-*</code></td> </tr> <tr> diff --git a/less/grid.less b/less/grid.less index ef6f1ebda..100d51fa2 100644 --- a/less/grid.less +++ b/less/grid.less @@ -76,7 +76,7 @@ // Grid classes for extra small devices like smartphones. No offset, push, or // pull classes are present here due to the size of the target. // -// Note that `.col-xs-12` doesn't get floated on purpose—there's no need since +// Note that `.col-xs-12` doesn't get floated on purpose--there's no need since // it's full-width. .col-xs-1, @@ -111,7 +111,7 @@ // Columns, offsets, pushes, and pulls for the small device range, from phones // to tablets. // -// Note that `.col-sm-12` doesn't get floated on purpose—there's no need since +// Note that `.col-sm-12` doesn't get floated on purpose--there's no need since // it's full-width. @media (min-width: @screen-sm) { @@ -189,7 +189,7 @@ // // Columns, offsets, pushes, and pulls for the desktop device range. // -// Note that `.col-md-12` doesn't get floated on purpose—there's no need since +// Note that `.col-md-12` doesn't get floated on purpose--there's no need since // it's full-width. @media (min-width: @screen-md) { @@ -269,7 +269,7 @@ // // Columns, offsets, pushes, and pulls for the large desktop device range. // -// Note that `.col-lg-12` doesn't get floated on purpose—there's no need since +// Note that `.col-lg-12` doesn't get floated on purpose--there's no need since // it's full-width. @media (min-width: @screen-lg-min) { |