Skip to content

B
bootstrap
Commit 0ca21039 authored by Mark Otto's avatar Mark Otto
Browse files
Options

fix indenting and remove hidden subnav on Scaffolding

parent 3ea30956
Show whitespace changes
Inline Side-by-side
Showing with 759 additions and 772 deletions
docs/scaffolding.html
View file @ 0ca21039
...@@ -68,26 +68,17 @@ ...@@ -68,26 +68,17 @@
<div class="container"> <div class="container">
<!-- Masthead <!-- Subhead
================================================== --> ================================================== -->
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>Scaffolding</h1> <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> <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="navbar navbar-subnav">
<div class="navbar-inner">
<ul class="nav">
<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>
</header> </header>
<!-- Docs nav
================================================== -->
<div class="row"> <div class="row">
<div class="span3 bs-docs-sidebar"> <div class="span3 bs-docs-sidebar">
<ul class="nav nav-list bs-docs-sidenav"> <ul class="nav nav-list bs-docs-sidenav">
...@@ -103,9 +94,9 @@ ...@@ -103,9 +94,9 @@
<!-- Global Bootstrap settings <!-- Global Bootstrap settings
================================================== --> ================================================== -->
<section id="global"> <section id="global">
<div class="page-header"> <div class="page-header">
<h1>Global styles <small>for CSS reset, typography, and links</small></h1> <h1>Global styles <small>for CSS reset, typography, and links</small></h1>
</div> </div>
...@@ -132,14 +123,14 @@ ...@@ -132,14 +123,14 @@
<h2>Reset via Normalize</h2> <h2>Reset via Normalize</h2>
<p>With Bootstrap 2, the old reset block has been dropped in favor of <a href="http://necolas.github.com/normalize.css/" target="_blank">Normalize.css</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> that also powers the <a href="http://html5boilerplate.com" target="_blank">HTML5 Boilerplate</a>. While we use much of Normalize within our <strong>reset.less</strong>, we have removed some elements specifically for Bootstrap.</p> <p>With Bootstrap 2, the old reset block has been dropped in favor of <a href="http://necolas.github.com/normalize.css/" target="_blank">Normalize.css</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> that also powers the <a href="http://html5boilerplate.com" target="_blank">HTML5 Boilerplate</a>. While we use much of Normalize within our <strong>reset.less</strong>, we have removed some elements specifically for Bootstrap.</p>
</section> </section>
<!-- Grid system <!-- Grid system
================================================== --> ================================================== -->
<section id="gridSystem"> <section id="gridSystem">
<div class="page-header"> <div class="page-header">
<h1>Default grid system <small>12 columns with a responsive twist</small></h1> <h1>Default grid system <small>12 columns with a responsive twist</small></h1>
</div> </div>
...@@ -237,13 +228,13 @@ ...@@ -237,13 +228,13 @@
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
</section> </section>
<!-- Fluid grid system <!-- Fluid grid system
================================================== --> ================================================== -->
<section id="fluidGridSystem"> <section id="fluidGridSystem">
<div class="page-header"> <div class="page-header">
<h1>Fluid grid system <small>12 responsive, percent-based columns</small></h1> <h1>Fluid grid system <small>12 responsive, percent-based columns</small></h1>
</div> </div>
...@@ -341,13 +332,13 @@ ...@@ -341,13 +332,13 @@
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
</section> </section>
<!-- Customizaton <!-- Customizaton
================================================== --> ================================================== -->
<section id="gridCustomization"> <section id="gridCustomization">
<div class="page-header"> <div class="page-header">
<h1>Grid customization</h1> <h1>Grid customization</h1>
</div> </div>
...@@ -397,13 +388,13 @@ ...@@ -397,13 +388,13 @@
<h2>Staying responsive</h2> <h2>Staying responsive</h2>
<p>Customization of the grid only works at the default level, the 940px grid. To maintain the responsive aspects of Bootstrap, you'll also have to manually customize the grids in <strong>responsive.less</strong> until a future update improves this.</p> <p>Customization of the grid only works at the default level, the 940px grid. To maintain the responsive aspects of Bootstrap, you'll also have to manually customize the grids in <strong>responsive.less</strong> until a future update improves this.</p>
</section> </section>
<!-- Layouts (Default and fluid) <!-- Layouts (Default and fluid)
================================================== --> ================================================== -->
<section id="layouts"> <section id="layouts">
<div class="page-header"> <div class="page-header">
<h1>Layouts <small>Basic templates to create webpages</small></h1> <h1>Layouts <small>Basic templates to create webpages</small></h1>
</div> </div>
...@@ -439,14 +430,14 @@ ...@@ -439,14 +430,14 @@
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
</section> </section>
<!-- Responsive design <!-- Responsive design
================================================== --> ================================================== -->
<section id="responsive"> <section id="responsive">
<div class="page-header"> <div class="page-header">
<h1>Responsive design <small>Media queries for various devices and resolutions</small></h1> <h1>Responsive design <small>Media queries for various devices and resolutions</small></h1>
</div> </div>
...@@ -597,10 +588,13 @@ ...@@ -597,10 +588,13 @@
<li>Desktop<span class="hidden-desktop">&#10004; Desktop</span></li> <li>Desktop<span class="hidden-desktop">&#10004; Desktop</span></li>
</ul> </ul>
</section> </section>
</div>
</div> </div>
</div>
<!-- Footer <!-- Footer
================================================== --> ================================================== -->
......
docs/templates/pages/scaffolding.mustache
View file @ 0ca21039
<!-- Masthead <!-- Subhead
================================================== --> ================================================== -->
<header class="jumbotron subhead" id="overview"> <header class="jumbotron subhead" id="overview">
<h1>{{_i}}Scaffolding{{/i}}</h1> <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> <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="navbar navbar-subnav">
<div class="navbar-inner">
<ul class="nav">
<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>
</div>
</header> </header>
<!-- Docs nav
================================================== -->
<div class="row"> <div class="row">
<div class="span3 bs-docs-sidebar"> <div class="span3 bs-docs-sidebar">
<ul class="nav nav-list bs-docs-sidenav"> <ul class="nav nav-list bs-docs-sidenav">
...@@ -33,9 +24,9 @@ ...@@ -33,9 +24,9 @@
<!-- Global Bootstrap settings <!-- Global Bootstrap settings
================================================== --> ================================================== -->
<section id="global"> <section id="global">
<div class="page-header"> <div class="page-header">
<h1>{{_i}}Global styles <small>for CSS reset, typography, and links</small>{{/i}}</h1> <h1>{{_i}}Global styles <small>for CSS reset, typography, and links</small>{{/i}}</h1>
</div> </div>
...@@ -62,14 +53,14 @@ ...@@ -62,14 +53,14 @@
<h2>{{_i}}Reset via Normalize{{/i}}</h2> <h2>{{_i}}Reset via Normalize{{/i}}</h2>
<p>{{_i}}With Bootstrap 2, the old reset block has been dropped in favor of <a href="http://necolas.github.com/normalize.css/" target="_blank">Normalize.css</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> that also powers the <a href="http://html5boilerplate.com" target="_blank">HTML5 Boilerplate</a>. While we use much of Normalize within our <strong>reset.less</strong>, we have removed some elements specifically for Bootstrap.{{/i}}</p> <p>{{_i}}With Bootstrap 2, the old reset block has been dropped in favor of <a href="http://necolas.github.com/normalize.css/" target="_blank">Normalize.css</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> that also powers the <a href="http://html5boilerplate.com" target="_blank">HTML5 Boilerplate</a>. While we use much of Normalize within our <strong>reset.less</strong>, we have removed some elements specifically for Bootstrap.{{/i}}</p>
</section> </section>
<!-- Grid system <!-- Grid system
================================================== --> ================================================== -->
<section id="gridSystem"> <section id="gridSystem">
<div class="page-header"> <div class="page-header">
<h1>{{_i}}Default grid system <small>12 columns with a responsive twist</small>{{/i}}</h1> <h1>{{_i}}Default grid system <small>12 columns with a responsive twist</small>{{/i}}</h1>
</div> </div>
...@@ -167,13 +158,13 @@ ...@@ -167,13 +158,13 @@
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
</section> </section>
<!-- Fluid grid system <!-- Fluid grid system
================================================== --> ================================================== -->
<section id="fluidGridSystem"> <section id="fluidGridSystem">
<div class="page-header"> <div class="page-header">
<h1>{{_i}}Fluid grid system <small>12 responsive, percent-based columns</small>{{/i}}</h1> <h1>{{_i}}Fluid grid system <small>12 responsive, percent-based columns</small>{{/i}}</h1>
</div> </div>
...@@ -271,13 +262,13 @@ ...@@ -271,13 +262,13 @@
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
</section> </section>
<!-- Customizaton <!-- Customizaton
================================================== --> ================================================== -->
<section id="gridCustomization"> <section id="gridCustomization">
<div class="page-header"> <div class="page-header">
<h1>{{_i}}Grid customization{{/i}}</h1> <h1>{{_i}}Grid customization{{/i}}</h1>
</div> </div>
...@@ -327,13 +318,13 @@ ...@@ -327,13 +318,13 @@
<h2>{{_i}}Staying responsive{{/i}}</h2> <h2>{{_i}}Staying responsive{{/i}}</h2>
<p>{{_i}}Customization of the grid only works at the default level, the 940px grid. To maintain the responsive aspects of Bootstrap, you'll also have to manually customize the grids in <strong>responsive.less</strong> until a future update improves this.{{/i}}</p> <p>{{_i}}Customization of the grid only works at the default level, the 940px grid. To maintain the responsive aspects of Bootstrap, you'll also have to manually customize the grids in <strong>responsive.less</strong> until a future update improves this.{{/i}}</p>
</section> </section>
<!-- Layouts (Default and fluid) <!-- Layouts (Default and fluid)
================================================== --> ================================================== -->
<section id="layouts"> <section id="layouts">
<div class="page-header"> <div class="page-header">
<h1>{{_i}}Layouts <small>Basic templates to create webpages</small>{{/i}}</h1> <h1>{{_i}}Layouts <small>Basic templates to create webpages</small>{{/i}}</h1>
</div> </div>
...@@ -369,14 +360,14 @@ ...@@ -369,14 +360,14 @@
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
</section> </section>
<!-- Responsive design <!-- Responsive design
================================================== --> ================================================== -->
<section id="responsive"> <section id="responsive">
<div class="page-header"> <div class="page-header">
<h1>{{_i}}Responsive design <small>Media queries for various devices and resolutions</small>{{/i}}</h1> <h1>{{_i}}Responsive design <small>Media queries for various devices and resolutions</small>{{/i}}</h1>
</div> </div>
...@@ -531,7 +522,9 @@ ...@@ -531,7 +522,9 @@
<li>{{_i}}Desktop{{/i}}<span class="hidden-desktop">&#10004; {{_i}}Desktop{{/i}}</span></li> <li>{{_i}}Desktop{{/i}}<span class="hidden-desktop">&#10004; {{_i}}Desktop{{/i}}</span></li>
</ul> </ul>
</section> </section>
</div> </div>{{! /span9 }}
</div> </div>{{! row}}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment