aboutsummaryrefslogtreecommitdiff
path: root/docs/scaffolding.html
diff options
context:
space:
mode:
Diffstat (limited to 'docs/scaffolding.html')
-rw-r--r--docs/scaffolding.html35
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">