diff options
| author | Mark Otto <[email protected]> | 2012-05-24 20:13:59 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-05-24 20:13:59 -0700 |
| commit | c1c679b644998efa98374158d667b14cd99d4864 (patch) | |
| tree | d2b9e9537f67d06549a7ebfb97909129bf5abbaf /docs/scaffolding.html | |
| parent | 7fa9f605d624fd1cc28ec610b3763714d3865a6b (diff) | |
| download | bootstrap-c1c679b644998efa98374158d667b14cd99d4864.tar.xz bootstrap-c1c679b644998efa98374158d667b14cd99d4864.zip | |
#3592: clarify grid sizing in grid docs
Diffstat (limited to 'docs/scaffolding.html')
| -rw-r--r-- | docs/scaffolding.html | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index e88656dbb..038e71463 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -75,22 +75,22 @@ <div class="container"> - <!-- Masthead - ================================================== --> - <header class="jumbotron subhead" id="overview"> - <h1>Scaffolding</h1> - <p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p> - <div class="subnav"> - <ul class="nav nav-pills"> - <li><a href="#global">Global styles</a></li> - <li><a href="#gridSystem">Grid system</a></li> - <li><a href="#fluidGridSystem">Fluid grid system</a></li> - <li><a href="#gridCustomization">Customizing</a></li> - <li><a href="#layouts">Layouts</a></li> - <li><a href="#responsive">Responsive design</a></li> - </ul> - </div> - </header> +<!-- Masthead +================================================== --> +<header class="jumbotron subhead" id="overview"> + <h1>Scaffolding</h1> + <p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p> + <div class="subnav"> + <ul class="nav nav-pills"> + <li><a href="#global">Global styles</a></li> + <li><a href="#gridSystem">Grid system</a></li> + <li><a href="#fluidGridSystem">Fluid grid system</a></li> + <li><a href="#gridCustomization">Customizing</a></li> + <li><a href="#layouts">Layouts</a></li> + <li><a href="#responsive">Responsive design</a></li> + </ul> + </div> +</header> @@ -172,8 +172,7 @@ </div> <div class="row"> <div class="span4"> - <p>The default grid system provided as part of Bootstrap is a <strong>940px-wide, 12-column grid</strong>.</p> - <p>It also has four responsive variations for various devices and resolutions: phone, tablet portrait, tablet landscape and small desktops, and large widescreen desktops.</p> + <p>The default grid system provided in Bootstrap utilizes <strong>12 columns</strong> that render out at widths of 724px, 940px (default without responsive CSS included), and 1170px. Below 767px viewports, the columns become fluid and stack vertically. </p> </div><!-- /.span --> <div class="span4"> <pre class="prettyprint linenums"> |