Skip to content

Commit c1c679b

Browse files
mdomdo
committed
twbs#3592: clarify grid sizing in grid docs
1 parent 7fa9f60 commit c1c679b

File tree

2 files changed

+34
-36
lines changed

2 files changed

+34
-36
lines changed

‎docs/scaffolding.html

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -75,22 +75,22 @@
7575

7676
<div class="container">
7777

78-
<!-- Masthead
79-
================================================== -->
80-
<header class="jumbotron subhead" id="overview">
81-
<h1>Scaffolding</h1>
82-
<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>
83-
<div class="subnav">
84-
<ul class="nav nav-pills">
85-
<li><a href="#global">Global styles</a></li>
86-
<li><a href="#gridSystem">Grid system</a></li>
87-
<li><a href="#fluidGridSystem">Fluid grid system</a></li>
88-
<li><a href="#gridCustomization">Customizing</a></li>
89-
<li><a href="#layouts">Layouts</a></li>
90-
<li><a href="#responsive">Responsive design</a></li>
91-
</ul>
92-
</div>
93-
</header>
78+
<!-- Masthead
79+
================================================== -->
80+
<header class="jumbotron subhead" id="overview">
81+
<h1>Scaffolding</h1>
82+
<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>
83+
<div class="subnav">
84+
<ul class="nav nav-pills">
85+
<li><a href="#global">Global styles</a></li>
86+
<li><a href="#gridSystem">Grid system</a></li>
87+
<li><a href="#fluidGridSystem">Fluid grid system</a></li>
88+
<li><a href="#gridCustomization">Customizing</a></li>
89+
<li><a href="#layouts">Layouts</a></li>
90+
<li><a href="#responsive">Responsive design</a></li>
91+
</ul>
92+
</div>
93+
</header>
9494

9595

9696

@@ -172,8 +172,7 @@ <h1>Default grid system <small>12 columns with a responsive twist</small></h1>
172172
</div>
173173
<div class="row">
174174
<div class="span4">
175-
<p>The default grid system provided as part of Bootstrap is a <strong>940px-wide, 12-column grid</strong>.</p>
176-
<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>
175+
<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>
177176
</div><!-- /.span -->
178177
<div class="span4">
179178
<pre class="prettyprint linenums">

‎docs/templates/pages/scaffolding.mustache

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
<!-- Masthead
2-
================================================== -->
3-
<header class="jumbotron subhead" id="overview">
4-
<h1>{{_i}}Scaffolding{{/i}}</h1>
5-
<p class="lead">{{_i}}Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.{{/i}}</p>
6-
<div class="subnav">
7-
<ul class="nav nav-pills">
8-
<li><a href="#global">{{_i}}Global styles{{/i}}</a></li>
9-
<li><a href="#gridSystem">{{_i}}Grid system{{/i}}</a></li>
10-
<li><a href="#fluidGridSystem">{{_i}}Fluid grid system{{/i}}</a></li>
11-
<li><a href="#gridCustomization">{{_i}}Customizing{{/i}}</a></li>
12-
<li><a href="#layouts">{{_i}}Layouts{{/i}}</a></li>
13-
<li><a href="#responsive">{{_i}}Responsive design{{/i}}</a></li>
14-
</ul>
15-
</div>
16-
</header>
1+
<!-- Masthead
2+
================================================== -->
3+
<header class="jumbotron subhead" id="overview">
4+
<h1>{{_i}}Scaffolding{{/i}}</h1>
5+
<p class="lead">{{_i}}Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.{{/i}}</p>
6+
<div class="subnav">
7+
<ul class="nav nav-pills">
8+
<li><a href="#global">{{_i}}Global styles{{/i}}</a></li>
9+
<li><a href="#gridSystem">{{_i}}Grid system{{/i}}</a></li>
10+
<li><a href="#fluidGridSystem">{{_i}}Fluid grid system{{/i}}</a></li>
11+
<li><a href="#gridCustomization">{{_i}}Customizing{{/i}}</a></li>
12+
<li><a href="#layouts">{{_i}}Layouts{{/i}}</a></li>
13+
<li><a href="#responsive">{{_i}}Responsive design{{/i}}</a></li>
14+
</ul>
15+
</div>
16+
</header>
1717

1818

1919

@@ -95,8 +95,7 @@
9595
</div>
9696
<div class="row">
9797
<div class="span4">
98-
<p>{{_i}}The default grid system provided as part of Bootstrap is a <strong>940px-wide, 12-column grid</strong>.{{/i}}</p>
99-
<p>{{_i}}It also has four responsive variations for various devices and resolutions: phone, tablet portrait, tablet landscape and small desktops, and large widescreen desktops.{{/i}}</p>
98+
<p>{{_i}}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. {{/i}}</p>
10099
</div><!-- /.span -->
101100
<div class="span4">
102101
<pre class="prettyprint linenums">

0 commit comments

Comments
 (0)