mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-20 04:11:39 +02:00
fix indenting and remove hidden subnav on Scaffolding
This commit is contained in:
Mark Otto
@@ -68,26 +68,17 @@
|
||||
|
||||
<div class="container">
|
||||
|
||||
<!-- Masthead
|
||||
<!-- Subhead
|
||||
================================================== -->
|
||||
<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="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>
|
||||
|
||||
|
||||
|
||||
<!-- Docs nav
|
||||
================================================== -->
|
||||
<div class="row">
|
||||
<div class="span3 bs-docs-sidebar">
|
||||
<ul class="nav nav-list bs-docs-sidenav">
|
||||
@@ -103,9 +94,9 @@
|
||||
|
||||
|
||||
|
||||
<!-- Global Bootstrap settings
|
||||
================================================== -->
|
||||
<section id="global">
|
||||
<!-- Global Bootstrap settings
|
||||
================================================== -->
|
||||
<section id="global">
|
||||
<div class="page-header">
|
||||
<h1>Global styles <small>for CSS reset, typography, and links</small></h1>
|
||||
</div>
|
||||
@@ -132,14 +123,14 @@
|
||||
<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>
|
||||
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- Grid system
|
||||
================================================== -->
|
||||
<section id="gridSystem">
|
||||
<!-- Grid system
|
||||
================================================== -->
|
||||
<section id="gridSystem">
|
||||
<div class="page-header">
|
||||
<h1>Default grid system <small>12 columns with a responsive twist</small></h1>
|
||||
</div>
|
||||
@@ -237,13 +228,13 @@
|
||||
</div>
|
||||
</div>
|
||||
</pre>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Fluid grid system
|
||||
================================================== -->
|
||||
<section id="fluidGridSystem">
|
||||
<!-- Fluid grid system
|
||||
================================================== -->
|
||||
<section id="fluidGridSystem">
|
||||
<div class="page-header">
|
||||
<h1>Fluid grid system <small>12 responsive, percent-based columns</small></h1>
|
||||
</div>
|
||||
@@ -341,13 +332,13 @@
|
||||
</div>
|
||||
</pre>
|
||||
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Customizaton
|
||||
================================================== -->
|
||||
<section id="gridCustomization">
|
||||
<!-- Customizaton
|
||||
================================================== -->
|
||||
<section id="gridCustomization">
|
||||
<div class="page-header">
|
||||
<h1>Grid customization</h1>
|
||||
</div>
|
||||
@@ -397,13 +388,13 @@
|
||||
<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>
|
||||
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Layouts (Default and fluid)
|
||||
================================================== -->
|
||||
<section id="layouts">
|
||||
<!-- Layouts (Default and fluid)
|
||||
================================================== -->
|
||||
<section id="layouts">
|
||||
<div class="page-header">
|
||||
<h1>Layouts <small>Basic templates to create webpages</small></h1>
|
||||
</div>
|
||||
@@ -439,14 +430,14 @@
|
||||
</div>
|
||||
</div>
|
||||
</pre>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- Responsive design
|
||||
================================================== -->
|
||||
<section id="responsive">
|
||||
<!-- Responsive design
|
||||
================================================== -->
|
||||
<section id="responsive">
|
||||
<div class="page-header">
|
||||
<h1>Responsive design <small>Media queries for various devices and resolutions</small></h1>
|
||||
</div>
|
||||
@@ -597,10 +588,13 @@
|
||||
<li>Desktop<span class="hidden-desktop">✔ Desktop</span></li>
|
||||
</ul>
|
||||
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Footer
|
||||
================================================== -->
|
||||
|
||||
71
docs/templates/pages/scaffolding.mustache
vendored
71
docs/templates/pages/scaffolding.mustache
vendored
@@ -1,23 +1,14 @@
|
||||
<!-- Masthead
|
||||
<!-- Subhead
|
||||
================================================== -->
|
||||
<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="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>
|
||||
|
||||
|
||||
|
||||
<!-- Docs nav
|
||||
================================================== -->
|
||||
<div class="row">
|
||||
<div class="span3 bs-docs-sidebar">
|
||||
<ul class="nav nav-list bs-docs-sidenav">
|
||||
@@ -33,9 +24,9 @@
|
||||
|
||||
|
||||
|
||||
<!-- Global Bootstrap settings
|
||||
================================================== -->
|
||||
<section id="global">
|
||||
<!-- Global Bootstrap settings
|
||||
================================================== -->
|
||||
<section id="global">
|
||||
<div class="page-header">
|
||||
<h1>{{_i}}Global styles <small>for CSS reset, typography, and links</small>{{/i}}</h1>
|
||||
</div>
|
||||
@@ -62,14 +53,14 @@
|
||||
<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>
|
||||
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- Grid system
|
||||
================================================== -->
|
||||
<section id="gridSystem">
|
||||
<!-- Grid system
|
||||
================================================== -->
|
||||
<section id="gridSystem">
|
||||
<div class="page-header">
|
||||
<h1>{{_i}}Default grid system <small>12 columns with a responsive twist</small>{{/i}}</h1>
|
||||
</div>
|
||||
@@ -167,13 +158,13 @@
|
||||
</div>
|
||||
</div>
|
||||
</pre>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Fluid grid system
|
||||
================================================== -->
|
||||
<section id="fluidGridSystem">
|
||||
<!-- Fluid grid system
|
||||
================================================== -->
|
||||
<section id="fluidGridSystem">
|
||||
<div class="page-header">
|
||||
<h1>{{_i}}Fluid grid system <small>12 responsive, percent-based columns</small>{{/i}}</h1>
|
||||
</div>
|
||||
@@ -271,13 +262,13 @@
|
||||
</div>
|
||||
</pre>
|
||||
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Customizaton
|
||||
================================================== -->
|
||||
<section id="gridCustomization">
|
||||
<!-- Customizaton
|
||||
================================================== -->
|
||||
<section id="gridCustomization">
|
||||
<div class="page-header">
|
||||
<h1>{{_i}}Grid customization{{/i}}</h1>
|
||||
</div>
|
||||
@@ -327,13 +318,13 @@
|
||||
<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>
|
||||
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
<!-- Layouts (Default and fluid)
|
||||
================================================== -->
|
||||
<section id="layouts">
|
||||
<!-- Layouts (Default and fluid)
|
||||
================================================== -->
|
||||
<section id="layouts">
|
||||
<div class="page-header">
|
||||
<h1>{{_i}}Layouts <small>Basic templates to create webpages</small>{{/i}}</h1>
|
||||
</div>
|
||||
@@ -369,14 +360,14 @@
|
||||
</div>
|
||||
</div>
|
||||
</pre>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- Responsive design
|
||||
================================================== -->
|
||||
<section id="responsive">
|
||||
<!-- Responsive design
|
||||
================================================== -->
|
||||
<section id="responsive">
|
||||
<div class="page-header">
|
||||
<h1>{{_i}}Responsive design <small>Media queries for various devices and resolutions</small>{{/i}}</h1>
|
||||
</div>
|
||||
@@ -531,7 +522,9 @@
|
||||
<li>{{_i}}Desktop{{/i}}<span class="hidden-desktop">✔ {{_i}}Desktop{{/i}}</span></li>
|
||||
</ul>
|
||||
|
||||
</section>
|
||||
</section>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>{{! /span9 }}
|
||||
</div>{{! row}}
|
||||
|
||||
Reference in New Issue
Block a user