diff options
| author | Mark Otto <[email protected]> | 2013-09-19 22:57:11 -0500 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-19 22:57:11 -0500 |
| commit | e148923f2764d0af6f7d6fb1b601840d241759b5 (patch) | |
| tree | 7831543c9b205eb0d184f2eb3187fb2cd3873110 /components.html | |
| parent | ef636bd62d6ab82e7cc70170f23bffe7bc8bd3cf (diff) | |
| parent | 22d308b2c12525a7ba65fca4f2ca7dba8a2a80bb (diff) | |
| download | bootstrap-e148923f2764d0af6f7d6fb1b601840d241759b5.tar.xz bootstrap-e148923f2764d0af6f7d6fb1b601840d241759b5.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
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 db869a036..e405df82d 100644 --- a/components.html +++ b/components.html @@ -2102,7 +2102,7 @@ body { padding-bottom: 70px; } <div class="page-header"> <h1 id="jumbotron">Jumbotron</h1> </div> - <p>A lightweight, flexible component that can optional extend the entire viewport to showcase key content on your site. To make the jumbotron full width, don't include it within a <code>.container</code>. Placing it within a container will keep it at the width of the rest of your content and provide rounded corners.</p> + <p>A lightweight, flexible component that can optionally extend the entire viewport to showcase key content on your site. To make the jumbotron full width, don't include it within a <code>.container</code>. Placing it within a container will keep it at the width of the rest of your content and provide rounded corners.</p> <div class="bs-example"> <div class="jumbotron"> <div class="container"> |