diff options
| author | Jacob Thornton <[email protected]> | 2012-01-23 15:17:32 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-23 15:17:32 -0800 |
| commit | b4b1ef68398b68dcdfa29465d06cd76d6bf2c49d (patch) | |
| tree | c833a8f3c5c41a4738a8901a86667a1f406cc7eb /docs/scaffolding.html | |
| parent | 9a68f115e7d850c47297bc7931fcbd1125b39f59 (diff) | |
| download | bootstrap-b4b1ef68398b68dcdfa29465d06cd76d6bf2c49d.tar.xz bootstrap-b4b1ef68398b68dcdfa29465d06cd76d6bf2c49d.zip | |
rebuild with new templates
Diffstat (limited to 'docs/scaffolding.html')
| -rw-r--r-- | docs/scaffolding.html | 93 |
1 files changed, 8 insertions, 85 deletions
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 904d53af6..be49f94d5 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -27,97 +27,30 @@ <body> - <!-- Navbar + <!-- Navbar ================================================== --> <div class="navbar navbar-fixed"> <div class="navbar-inner"> <div class="container"> <a class="brand" href="./index.html">Bootstrap</a> <ul class="nav"> -<<<<<<< HEAD - <li class=""><a href="./index.html">Overview</a></li> - <li class="dropdown active"> - <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown"> - Scaffolding - <b class="caret"></b> - </a> - <ul class="dropdown-menu"> - <li><a href="./scaffolding.html#grid-system">Grid system</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="dropdown "> - <a href="./base-css.html" class="dropdown-toggle" data-toggle="dropdown"> - Base CSS - <b class="caret"></b> - </a> - <ul class="dropdown-menu"> - <li><a href="./base-css.html#typography">Typography</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="dropdown "> - <a href="./components.html" class="dropdown-toggle" data-toggle="dropdown"> - Components - <b class="caret"></b> - </a> - <ul class="dropdown-menu"> - <li><a href="./components.html#buttonGroups">Button groups</a></li> - <li><a href="./components.html#buttonDropdowns">Split 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#thumbnails">Thumbnails</a></li> - <li><a href="./components.html#alerts">Alert messages</a></li> - <li><a href="./components.html#progress">Progress bars</a></li> - </ul> - </li> - <li class="dropdown "> - <a href="./javascript.html" class="dropdown-toggle" data-toggle="dropdown"> - Javascript plugins - <b class="caret"></b> - </a> - <ul class="dropdown-menu"> - <li><a href="./javascript.html#javascript">Overview</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"> - Using LESS - </a> -======= - <li><a href="./index.html">Overview</a></li> + <a href="./index.html">Overview</a> + </li> <li class="active"> <a href="./scaffolding.html">Scaffolding</a> </li> - <li> + <li class=""> <a href="./base-css.html">Base CSS</a> </li> - <li> + <li class=""> <a href="./components.html">Components</a> </li> - <li> + <li class=""> <a href="./javascript.html">Javascript plugins</a> </li> - <li> + <li class=""> <a href="./less.html">Using LESS</a> ->>>>>>> a074087034716804610637a5ad9cc0447a2cccb2 </li> </ul> </div> @@ -126,15 +59,6 @@ <div class="container"> -<<<<<<< HEAD - -<!-- 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> -</header> -======= <!-- Masthead ================================================== --> <header class="jumbotron subhead" id="overview"> @@ -146,7 +70,6 @@ <li><a href="./scaffolding.html#responsive">Responsive design</a></li> </ul> </header> ->>>>>>> a074087034716804610637a5ad9cc0447a2cccb2 @@ -451,7 +374,7 @@ </div> </div> </section> - <!-- Footer + <!-- Footer ================================================== --> <footer class="footer"> <p class="pull-right"><a href="#">Back to top</a></p> |