mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-19 16:54:24 +01:00
#3592: clarify grid sizing in grid docs
This commit is contained in:
parent
7fa9f605d6
commit
c1c679b644
@ -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">
|
||||
|
35
docs/templates/pages/scaffolding.mustache
vendored
35
docs/templates/pages/scaffolding.mustache
vendored
@ -1,19 +1,19 @@
|
||||
<!-- Masthead
|
||||
================================================== -->
|
||||
<header class="jumbotron subhead" id="overview">
|
||||
<h1>{{_i}}Scaffolding{{/i}}</h1>
|
||||
<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>
|
||||
<div class="subnav">
|
||||
<ul class="nav nav-pills">
|
||||
<li><a href="#global">{{_i}}Global styles{{/i}}</a></li>
|
||||
<li><a href="#gridSystem">{{_i}}Grid system{{/i}}</a></li>
|
||||
<li><a href="#fluidGridSystem">{{_i}}Fluid grid system{{/i}}</a></li>
|
||||
<li><a href="#gridCustomization">{{_i}}Customizing{{/i}}</a></li>
|
||||
<li><a href="#layouts">{{_i}}Layouts{{/i}}</a></li>
|
||||
<li><a href="#responsive">{{_i}}Responsive design{{/i}}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</header>
|
||||
<!-- Masthead
|
||||
================================================== -->
|
||||
<header class="jumbotron subhead" id="overview">
|
||||
<h1>{{_i}}Scaffolding{{/i}}</h1>
|
||||
<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>
|
||||
<div class="subnav">
|
||||
<ul class="nav nav-pills">
|
||||
<li><a href="#global">{{_i}}Global styles{{/i}}</a></li>
|
||||
<li><a href="#gridSystem">{{_i}}Grid system{{/i}}</a></li>
|
||||
<li><a href="#fluidGridSystem">{{_i}}Fluid grid system{{/i}}</a></li>
|
||||
<li><a href="#gridCustomization">{{_i}}Customizing{{/i}}</a></li>
|
||||
<li><a href="#layouts">{{_i}}Layouts{{/i}}</a></li>
|
||||
<li><a href="#responsive">{{_i}}Responsive design{{/i}}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
|
||||
|
||||
@ -95,8 +95,7 @@
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<p>{{_i}}The default grid system provided as part of Bootstrap is a <strong>940px-wide, 12-column grid</strong>.{{/i}}</p>
|
||||
<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>
|
||||
<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>
|
||||
</div><!-- /.span -->
|
||||
<div class="span4">
|
||||
<pre class="prettyprint linenums">
|
||||
|
Loading…
x
Reference in New Issue
Block a user