diff options
| author | Mark Otto <[email protected]> | 2012-06-05 00:46:16 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-06-05 00:46:16 -0700 |
| commit | dd127611e12b9bab9d6da0c24532c5cd151108fd (patch) | |
| tree | 817928e7073e72baab6bce1ba09fc6b439109a10 /docs/scaffolding.html | |
| parent | 094e65eb9dd68a4076d5978025b65c7f03792287 (diff) | |
| download | bootstrap-dd127611e12b9bab9d6da0c24532c5cd151108fd.tar.xz bootstrap-dd127611e12b9bab9d6da0c24532c5cd151108fd.zip | |
two col scaffolding rev
Diffstat (limited to 'docs/scaffolding.html')
| -rw-r--r-- | docs/scaffolding.html | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index cd80fc80a..ffc55c3b9 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -74,7 +74,23 @@ </div> </div> - <div class="bs-docs-container"> + <div class="container"> + +<div class="row"> + <div class="span3"> + <div class="bs-docs-contents well"> + <h3>Contents</h3> + <ol> + <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> + </ol> + </div> + </div> + <div class="span9"> <!-- Masthead ================================================== --> @@ -82,17 +98,6 @@ <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="bs-docs-contents"> - <h4>Contents</h4> - <ul> - <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> <!-- <div class="subnav"> <ul class="nav nav-pills"> @@ -183,22 +188,15 @@ </div> </div> - <div class="row"> - <div class="span4"> - <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"> + <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> <pre class="prettyprint linenums"> <div class="row"> <div class="span4">...</div> <div class="span8">...</div> </div> </pre> - </div><!-- /.span --> - <div class="span4"> - <p>As shown here, a basic layout can be created with two "columns", each spanning a number of the 12 foundational columns we defined as part of our grid system.</p> - </div><!-- /.span --> - </div><!-- /.row --> + + <p>As shown here, a basic layout can be created with two "columns", each spanning a number of the 12 foundational columns we defined as part of our grid system.</p> <br> @@ -611,14 +609,16 @@ </section> + </div> +</div> <!-- Footer ================================================== --> <footer class="footer"> + <p class="pull-right"><a href="#">Back to top</a></p> <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p> <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> - <p><a href="#">Back to top</a></p> </footer> </div><!-- /container --> |
