diff options
| author | Marcus Schwab <[email protected]> | 2012-06-11 02:04:14 -0700 |
|---|---|---|
| committer | Marcus Schwab <[email protected]> | 2012-06-11 02:04:14 -0700 |
| commit | 97cbefa72f4b60dc72077f61a03b44a0d4f9b960 (patch) | |
| tree | 3782ddf07bef753c3b43b02595ffaf08aa955a9b /docs/scaffolding.html | |
| parent | bd19b42c15108b3c60407924a1725473660120d9 (diff) | |
| parent | a0cd886c56708bbd8d6896ee81b04579f86fb0aa (diff) | |
| download | bootstrap-97cbefa72f4b60dc72077f61a03b44a0d4f9b960.tar.xz bootstrap-97cbefa72f4b60dc72077f61a03b44a0d4f9b960.zip | |
Merge remote-tracking branch 'upstream/2.1.0-wip' into 2.1.0-wip
Diffstat (limited to 'docs/scaffolding.html')
| -rw-r--r-- | docs/scaffolding.html | 166 |
1 files changed, 70 insertions, 96 deletions
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 9b7b66cd2..f30bb8c32 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -27,84 +27,50 @@ </head> - <body> - - <div class="bs-docs-nav"> - <h3 class="bs-docs-logo"><a href="./index.html">Bootstrap</a></h3> - <ul class="bs-nav"> - <li class="active"> - <a href="./scaffolding.html">Scaffolding</a> - <ul> - <li><a href="./scaffolding.html#global">Global styles</a></li> - <li><a href="./scaffolding.html#gridSystem">Grid system</a></li> - <li><a href="./scaffolding.html#fluidGridSystem">Fluid grid system</a></li> - <li><a href="./scaffolding.html#gridCustomization">Customizing</a></li> - <li><a href="./scaffolding.html#layouts">Layouts</a></li> - <li><a href="./scaffolding.html#responsive">Responsive design</a></li> - </ul> - </li> - <li class=""> - <a href="./base-css.html">Base CSS</a> - <ul> - <li><a href="./base-css.html#typography">Typography</a></li> - <li><a href="./base-css.html#code">Code</a></li> - <li><a href="./base-css.html#tables">Tables</a></li> - <li><a href="./base-css.html#forms">Forms</a></li> - <li><a href="./base-css.html#buttons">Buttons</a></li> - <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li> - </ul> - </li> - <li class=""> - <a href="./components.html">Components</a> - <ul> - <li><a href="./components.html#buttonGroups">Button groups</a></li> - <li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li> - <li><a href="./components.html#navs">Nav, tabs, pills</a></li> - <li><a href="./components.html#navbar">Navbar</a></li> - <li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li> - <li><a href="./components.html#pagination">Pagination</a></li> - <li><a href="./components.html#labels">Labels</a></li> - <li><a href="./components.html#badges">Badges</a></li> - <li><a href="./components.html#typography">Typography</a></li> - <li><a href="./components.html#thumbnails">Thumbnails</a></li> - <li><a href="./components.html#alerts">Alerts</a></li> - <li><a href="./components.html#progress">Progress bars</a></li> - <li><a href="./components.html#misc">Miscellaneous</a></li> - </ul> - </li> - <li class=""> - <a href="./javascript.html">Javascript</a> - <ul> - <li><a href="./javascript.html#javascript">All plugins</a></li> - <li><a href="./javascript.html#modals">Modal</a></li> - <li><a href="./javascript.html#dropdowns">Dropdown</a></li> - <li><a href="./javascript.html#scrollspy">Scrollspy</a></li> - <li><a href="./javascript.html#tabs">Tab</a></li> - <li><a href="./javascript.html#tooltips">Tooltip</a></li> - <li><a href="./javascript.html#popovers">Popover</a></li> - <li><a href="./javascript.html#alerts">Alert</a></li> - <li><a href="./javascript.html#buttons">Button</a></li> - <li><a href="./javascript.html#collapse">Collapse</a></li> - <li><a href="./javascript.html#carousel">Carousel</a></li> - <li><a href="./javascript.html#typeahead">Typeahead</a></li> - </ul> - </li> - <li class=""> - <a href="./less.html">LESS</a> - <ul> - <li><a href="./less.html#builtWith">Built with Less</a></li> - <li><a href="./less.html#variables">Variables</a></li> - <li><a href="./less.html#mixins">Mixins</a></li> - <li><a href="./less.html#compiling">Compiling Bootstrap</a></li> - </ul> - </li> - <li class=""> - <a href="./download.html">Customize</a> - </li> - <li class=""> - <a href="./examples.html">Examples</a> - </li> - </ul> + <body data-spy="scroll" data-target=".subnav" data-offset="50"> + + <!-- Navbar + ================================================== --> + <div class="navbar navbar-fixed-top"> + <div class="navbar-inner"> + <div class="bs-docs-container"> + <button type="button"class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="brand" href="./index.html">Bootstrap</a> + <div class="nav-collapse collapse"> + <ul class="nav"> + <li class=""> + <a href="./index.html">Home</a> + </li> + <li class="active"> + <a href="./scaffolding.html">Scaffolding</a> + </li> + <li class=""> + <a href="./base-css.html">Base CSS</a> + </li> + <li class=""> + <a href="./components.html">Components</a> + </li> + <li class=""> + <a href="./javascript.html">Javascript</a> + </li> + <li class=""> + <a href="./less.html">LESS</a> + </li> + <li class="divider-vertical"></li> + <li class=""> + <a href="./download.html">Customize</a> + </li> + <li class=""> + <a href="./examples.html">Examples</a> + </li> + </ul> + </div> + </div> + </div> </div> <div class="bs-docs-container"> @@ -114,6 +80,16 @@ <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> @@ -173,24 +149,22 @@ <div class="span1">1</div> <div class="span1">1</div> <div class="span1">1</div> - <div class="span1">1</div> - <div class="span1">1</div> </div> <div class="row show-grid"> - <div class="span4">4</div> + <div class="span2">2</div> <div class="span4">4</div> <div class="span4">4</div> </div> <div class="row show-grid"> <div class="span4">4</div> - <div class="span8">8</div> + <div class="span6">6</div> </div> <div class="row show-grid"> - <div class="span6">6</div> - <div class="span6">6</div> + <div class="span5">5</div> + <div class="span5">5</div> </div> <div class="row show-grid"> - <div class="span12">12</div> + <div class="span10">10</div> </div> </div> @@ -209,14 +183,14 @@ <div class="bs-docs-grid"> <div class="row show-grid"> <div class="span4">4</div> - <div class="span4 offset4">4 offset 4</div> + <div class="span4 offset2">4 offset 2</div> </div><!-- /row --> <div class="row show-grid"> - <div class="span3 offset3">3 offset 3</div> - <div class="span3 offset3">3 offset 3</div> + <div class="span3 offset2">3 offset 2</div> + <div class="span3 offset2">3 offset 2</div> </div><!-- /row --> <div class="row show-grid"> - <div class="span8 offset4">8 offset 4</div> + <div class="span6 offset4">6 offset 4</div> </div><!-- /row --> </div> <pre class="prettyprint linenums"> @@ -231,13 +205,13 @@ <h3>Example</h3> <p>Here two nested <code>.span4</code> columns are placed within a <code>.span8</code>.</p> <div class="row show-grid"> - <div class="span8"> + <div class="span10"> Level 1 of column <div class="row show-grid"> - <div class="span4"> + <div class="span5"> Level 2 </div> - <div class="span4"> + <div class="span5"> Level 2 </div> </div> @@ -245,11 +219,11 @@ </div> <pre class="prettyprint linenums"> <div class="row"> - <div class="span8"> + <div class="span10"> Level 1 column <div class="row"> - <div class="span4">Level 2</div> - <div class="span4">Level 2</div> + <div class="span5">Level 2</div> + <div class="span5">Level 2</div> </div> </div> </div> @@ -604,7 +578,7 @@ <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> </footer> - </div><!-- /container --> + </div> |