diff options
| -rw-r--r-- | docs/assets/css/docs.css | 19 | ||||
| -rw-r--r-- | docs/base-css.html | 164 | ||||
| -rw-r--r-- | docs/components.html | 4 | ||||
| -rw-r--r-- | docs/download.html | 4 | ||||
| -rw-r--r-- | docs/examples.html | 4 | ||||
| -rw-r--r-- | docs/index.html | 4 | ||||
| -rw-r--r-- | docs/javascript.html | 4 | ||||
| -rw-r--r-- | docs/less.html | 4 | ||||
| -rw-r--r-- | docs/scaffolding.html | 67 | ||||
| -rw-r--r-- | docs/templates/layout.mustache | 4 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 160 | ||||
| -rw-r--r-- | docs/templates/pages/scaffolding.mustache | 64 | ||||
| -rw-r--r-- | docs/upgrading.html | 4 |
13 files changed, 323 insertions, 183 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b694f107a..1df882799 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -23,6 +23,10 @@ li { line-height: 20px; } +.bs-docs-container { + max-width: 780px; + margin: 0 auto; +} /* Tweak navbar brand link to be super sleek -------------------------------------------------- */ @@ -64,16 +68,14 @@ hr.soften { } /* Table of contents */ -.bs-docs-content { +.bs-docs-contents { color: #999; } -.bs-docs-contents ol { - margin-top: 5px; - margin-bottom: 0; +.bs-docs-contents h3 { + } .bs-docs-contents li { line-height: 25px; - color: #999; } @@ -130,6 +132,7 @@ hr.soften { .subhead { padding-bottom: 0; margin-bottom: 9px; + border-bottom: 1px solid #ddd; } .subhead h1 { font-size: 54px; @@ -297,10 +300,10 @@ hr.soften { .footer { padding: 35px 0 36px; margin-top: 45px; + text-align: center; border-top: 1px solid #e5e5e5; } .footer p { - margin-bottom: 5px; color: #555; } @@ -696,7 +699,7 @@ form.well { ------------------------- */ .bs-docs-grid { width: 940px; - margin-left: -240px; + margin-left: -80px; } @@ -915,7 +918,7 @@ form.well { .bs-docs-grid { width: 1170px; - margin-left: -300px; + margin-left: -195px; } } diff --git a/docs/base-css.html b/docs/base-css.html index 75bfced93..95b4f1f97 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -74,14 +74,14 @@ </div> </div> - <div class="container"> + <div class="bs-docs-container"> <!-- Masthead ================================================== --> <header class="jumbotron subhead" id="overview"> <h1>Base CSS</h1> <p class="lead">On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.</p> - <div class="subnav"> +<!-- <div class="subnav"> <ul class="nav nav-pills"> <li><a href="#typography">Typography</a></li> <li><a href="#code">Code</a></li> @@ -91,9 +91,23 @@ <li><a href="#icons">Icons by Glyphicons</a></li> </ul> </div> -</header> + --></header> +<section id="contents"> + <div class="bs-docs-contents"> + <h3>Contents</h3> + <ol> + <li><a href="#typography">Typography</a></li> + <li><a href="#code">Code</a></li> + <li><a href="#tables">Tables</a></li> + <li><a href="#forms">Forms</a></li> + <li><a href="#buttons">Buttons</a></li> + <li><a href="#icons">Icons by Glyphicons</a></li> + </ol> + </div> +</section> + <!-- Typography ================================================== --> <section id="typography"> @@ -288,7 +302,7 @@ <h2>Lists</h2> <h3>Unordered</h3> - <p>A list of items in which the order does not explicitly matter.</p> + <p>A list of items in which the order does <em>not</em> explicitly matter.</p> <div class="bs-docs-example"> <ul> <li>Lorem ipsum dolor sit amet</li> @@ -314,64 +328,94 @@ </ul> </pre> - <h3>Unstyled</h3> - <p><code><ul class="unstyled"></code></p> - <ul class="unstyled"> - <li>Lorem ipsum dolor sit amet</li> - <li>Consectetur adipiscing elit</li> - <li>Integer molestie lorem at massa</li> - <li>Facilisis in pretium nisl aliquet</li> - <li>Nulla volutpat aliquam velit - <ul> - <li>Phasellus iaculis neque</li> - <li>Purus sodales ultricies</li> - <li>Vestibulum laoreet porttitor sem</li> - <li>Ac tristique libero volutpat at</li> - </ul> - </li> - <li>Faucibus porta lacus fringilla vel</li> - <li>Aenean sit amet erat nunc</li> - <li>Eget porttitor lorem</li> - </ul> - <h3>Ordered</h3> - <p><code><ol></code></p> - <ol> - <li>Lorem ipsum dolor sit amet</li> - <li>Consectetur adipiscing elit</li> - <li>Integer molestie lorem at massa</li> - <li>Facilisis in pretium nisl aliquet</li> - <li>Nulla volutpat aliquam velit</li> - <li>Faucibus porta lacus fringilla vel</li> - <li>Aenean sit amet erat nunc</li> - <li>Eget porttitor lorem</li> - </ol> + <p>A list of items in which the order <em>does</em> explicitly matter.</p> + <div class="bs-docs-example"> + <ol> + <li>Lorem ipsum dolor sit amet</li> + <li>Consectetur adipiscing elit</li> + <li>Integer molestie lorem at massa</li> + <li>Facilisis in pretium nisl aliquet</li> + <li>Nulla volutpat aliquam velit</li> + <li>Faucibus porta lacus fringilla vel</li> + <li>Aenean sit amet erat nunc</li> + <li>Eget porttitor lorem</li> + </ol> + </div> +<pre class="prettyprint linenums"> +<ol> + <li>...</li> +</ol> +</pre> + + <h3>Unstyled</h3> + <p>A list of items with no <code>list-style</code> or additional left padding.</p> + <div class="bs-docs-example"> + <ul class="unstyled"> + <li>Lorem ipsum dolor sit amet</li> + <li>Consectetur adipiscing elit</li> + <li>Integer molestie lorem at massa</li> + <li>Facilisis in pretium nisl aliquet</li> + <li>Nulla volutpat aliquam velit + <ul> + <li>Phasellus iaculis neque</li> + <li>Purus sodales ultricies</li> + <li>Vestibulum laoreet porttitor sem</li> + <li>Ac tristique libero volutpat at</li> + </ul> + </li> + <li>Faucibus porta lacus fringilla vel</li> + <li>Aenean sit amet erat nunc</li> + <li>Eget porttitor lorem</li> + </ul> + </div> +<pre class="prettyprint linenums"> +<ul class="unstyled"> + <li>...</li> +</ul> +</pre> <h3>Description</h3> - <p><code><dl></code></p> - <dl> - <dt>Description lists</dt> - <dd>A description list is perfect for defining terms.</dd> - <dt>Euismod</dt> - <dd>Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</dd> - <dd>Donec id elit non mi porta gravida at eget metus.</dd> - <dt>Malesuada porta</dt> - <dd>Etiam porta sem malesuada magna mollis euismod.</dd> - </dl> - - <h3>Horizontal description</h3> - <p><code><dl class="dl-horizontal"></code></p> - <dl class="dl-horizontal"> - <dt>Description lists</dt> - <dd>A description list is perfect for defining terms.</dd> - <dt>Euismod</dt> - <dd>Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</dd> - <dd>Donec id elit non mi porta gravida at eget metus.</dd> - <dt>Malesuada porta</dt> - <dd>Etiam porta sem malesuada magna mollis euismod.</dd> - <dt>Felis euismod semper eget lacinia</dt> - <dd>Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</dd> - </dl> + <p>A list of terms with their associated descriptions.</p> + <div class="bs-docs-example"> + <dl> + <dt>Description lists</dt> + <dd>A description list is perfect for defining terms.</dd> + <dt>Euismod</dt> + <dd>Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</dd> + <dd>Donec id elit non mi porta gravida at eget metus.</dd> + <dt>Malesuada porta</dt> + <dd>Etiam porta sem malesuada magna mollis euismod.</dd> + </dl> + </div> +<pre class="prettyprint linenums"> +<dl> + <dt>...</dt> + <dd>...</dd> +</dl> +</pre> + + <h4>Horizontal description</h4> + <p>Make terms and descriptions in <code><dl></code> line up side-by-side.</p> + <div class="bs-docs-example"> + <dl class="dl-horizontal"> + <dt>Description lists</dt> + <dd>A description list is perfect for defining terms.</dd> + <dt>Euismod</dt> + <dd>Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</dd> + <dd>Donec id elit non mi porta gravida at eget metus.</dd> + <dt>Malesuada porta</dt> + <dd>Etiam porta sem malesuada magna mollis euismod.</dd> + <dt>Felis euismod semper eget lacinia</dt> + <dd>Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</dd> + </dl> + </div> +<pre class="prettyprint linenums"> +<dl class="dl-horizontal"> + <dt>...</dt> + <dd>...</dd> +</dl> +</pre> <hr> <p> <span class="label label-info">Heads up!</span> @@ -1592,10 +1636,10 @@ For example, <code>section</code> should be wrapped as inline. <!-- 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 --> diff --git a/docs/components.html b/docs/components.html index 1e324bbfd..72b86200f 100644 --- a/docs/components.html +++ b/docs/components.html @@ -74,7 +74,7 @@ </div> </div> - <div class="container"> + <div class="bs-docs-container"> <!-- Masthead ================================================== --> @@ -1847,10 +1847,10 @@ class="clearfix" <!-- 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 --> diff --git a/docs/download.html b/docs/download.html index a387c7921..9979ef26b 100644 --- a/docs/download.html +++ b/docs/download.html @@ -74,7 +74,7 @@ </div> </div> - <div class="container"> + <div class="bs-docs-container"> <!-- Masthead ================================================== --> @@ -421,10 +421,10 @@ <!-- 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 --> diff --git a/docs/examples.html b/docs/examples.html index 5e8d74a3b..c70c4b00d 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -74,7 +74,7 @@ </div> </div> - <div class="container"> + <div class="bs-docs-container"> <!-- Masthead ================================================== --> @@ -112,10 +112,10 @@ <!-- 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 --> diff --git a/docs/index.html b/docs/index.html index 1d55aa23a..dbc5b99d0 100644 --- a/docs/index.html +++ b/docs/index.html @@ -74,7 +74,7 @@ </div> </div> - <div class="container"> + <div class="bs-docs-container"> <!-- Masthead ================================================== --> @@ -187,10 +187,10 @@ <!-- 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 --> diff --git a/docs/javascript.html b/docs/javascript.html index f5276ccdd..7e604a37b 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -74,7 +74,7 @@ </div> </div> - <div class="container"> + <div class="bs-docs-container"> <!-- Masthead ================================================== --> @@ -1508,10 +1508,10 @@ $('.carousel').carousel({ <!-- 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 --> diff --git a/docs/less.html b/docs/less.html index ad860bd4b..4a56f65a0 100644 --- a/docs/less.html +++ b/docs/less.html @@ -74,7 +74,7 @@ </div> </div> - <div class="container"> + <div class="bs-docs-container"> <!-- Masthead ================================================== --> @@ -1025,10 +1025,10 @@ <!-- 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 --> diff --git a/docs/scaffolding.html b/docs/scaffolding.html index ffc55c3b9..5a91d67a6 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -74,23 +74,7 @@ </div> </div> - <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"> + <div class="bs-docs-container"> <!-- Masthead ================================================== --> @@ -98,7 +82,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="subnav"> <ul class="nav nav-pills"> <li><a href="#global">Global styles</a></li> @@ -112,6 +95,50 @@ --></header> +<section class="bs-docs-contents"> + <h3>Contents</h3> + <ol> + <li> + <a href="#global">Global styles</a> + <ul> + <li><a href="#global-1">Requires HTML5 doctype</a></li> + <li><a href="#global-2">Typography and links</a></li> + <li><a href="#global-3">Reset via Normalize</a></li> + </ul> + </li> + <li> + <a href="#gridSystem">Grid system</a> + <ul> + <li><a href="#gridSystem-1">Offsetting columns</a></li> + <li><a href="#gridSystem-2">Nesting columns</a></li> + </ul> + </li> + <li> + <a href="#fluidGridSystem">Fluid grid system</a> + <ul> + <li><a href="#fluidGridSystem-1">Nesting fluid columns</a></li> + </ul> + </li> + <li> + <a href="#gridCustomization">Grid Customization</a> + </li> + <li> + <a href="#layouts">Layouts</a> + <ul> + <li><a href="#layouts-1">Fixed layout</a></li> + <li><a href="#layouts-1">Fluid layout</a></li> + </ul> + </li> + <li> + <a href="#responsive">Responsive design</a> + <ul> + <li><a href="#responsive-1">Responsive utility classes</a></li> + <li><a href="#responsive-2">Responsive tests</a></li> + </ul> + </li> + </ol> +</section> + <!-- Global Bootstrap settings @@ -609,16 +636,14 @@ </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 --> diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index ae2ce4aad..3e8448d19 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -86,7 +86,7 @@ </div> </div> - <div class="container"> + <div class="bs-docs-container"> {{>body}} @@ -94,10 +94,10 @@ <!-- Footer ================================================== --> <footer class="footer"> - <p class="pull-right"><a href="#">{{_i}}Back to top{{/i}}</a></p> <p>{{_i}}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>.{{/i}}</p> <p>{{_i}}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>.{{/i}}</p> <p>{{_i}}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>.{{/i}}</p> + <p><a href="#">{{_i}}Back to top{{/i}}</a></p> </footer> </div><!-- /container --> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 9ef80c125..ce710d7e3 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -3,7 +3,7 @@ <header class="jumbotron subhead" id="overview"> <h1>{{_i}}Base CSS{{/i}}</h1> <p class="lead">{{_i}}On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.{{/i}}</p> - <div class="subnav"> +<!-- <div class="subnav"> <ul class="nav nav-pills"> <li><a href="#typography">{{_i}}Typography{{/i}}</a></li> <li><a href="#code">{{_i}}Code{{/i}}</a></li> @@ -13,9 +13,23 @@ <li><a href="#icons">{{_i}}Icons by Glyphicons{{/i}}</a></li> </ul> </div> -</header> + --></header> +<section id="contents"> + <div class="bs-docs-contents"> + <h3>{{_i}}Contents{{/i}}</h3> + <ol> + <li><a href="#typography">{{_i}}Typography{{/i}}</a></li> + <li><a href="#code">{{_i}}Code{{/i}}</a></li> + <li><a href="#tables">{{_i}}Tables{{/i}}</a></li> + <li><a href="#forms">{{_i}}Forms{{/i}}</a></li> + <li><a href="#buttons">{{_i}}Buttons{{/i}}</a></li> + <li><a href="#icons">{{_i}}Icons by Glyphicons{{/i}}</a></li> + </ol> + </div> +</section> + <!-- Typography ================================================== --> <section id="typography"> @@ -219,7 +233,7 @@ <h2>{{_i}}Lists{{/i}}</h2> <h3>{{_i}}Unordered{{/i}}</h3> - <p>{{_i}}A list of items in which the order does not explicitly matter.{{/i}}</p> + <p>{{_i}}A list of items in which the order does <em>not</em> explicitly matter.{{/i}}</p> <div class="bs-docs-example"> <ul> <li>Lorem ipsum dolor sit amet</li> @@ -245,64 +259,94 @@ </ul> </pre> - <h3>{{_i}}Unstyled{{/i}}</h3> - <p><code><ul class="unstyled"></code></p> - <ul class="unstyled"> - <li>Lorem ipsum dolor sit amet</li> - <li>Consectetur adipiscing elit</li> - <li>Integer molestie lorem at massa</li> - <li>Facilisis in pretium nisl aliquet</li> - <li>Nulla volutpat aliquam velit - <ul> - <li>Phasellus iaculis neque</li> - <li>Purus sodales ultricies</li> - <li>Vestibulum laoreet porttitor sem</li> - <li>Ac tristique libero volutpat at</li> - </ul> - </li> - <li>Faucibus porta lacus fringilla vel</li> - <li>Aenean sit amet erat nunc</li> - <li>Eget porttitor lorem</li> - </ul> - <h3>{{_i}}Ordered{{/i}}</h3> - <p><code><ol></code></p> - <ol> - <li>Lorem ipsum dolor sit amet</li> - <li>Consectetur adipiscing elit</li> - <li>Integer molestie lorem at massa</li> - <li>Facilisis in pretium nisl aliquet</li> - <li>Nulla volutpat aliquam velit</li> - <li>Faucibus porta lacus fringilla vel</li> - <li>Aenean sit amet erat nunc</li> - <li>Eget porttitor lorem</li> - </ol> + <p>{{_i}}A list of items in which the order <em>does</em> explicitly matter.{{/i}}</p> + <div class="bs-docs-example"> + <ol> + <li>Lorem ipsum dolor sit amet</li> + <li>Consectetur adipiscing elit</li> + <li>Integer molestie lorem at massa</li> + <li>Facilisis in pretium nisl aliquet</li> + <li>Nulla volutpat aliquam velit</li> + <li>Faucibus porta lacus fringilla vel</li> + <li>Aenean sit amet erat nunc</li> + <li>Eget porttitor lorem</li> + </ol> + </div> +<pre class="prettyprint linenums"> +<ol> + <li>...</li> +</ol> +</pre> + + <h3>{{_i}}Unstyled{{/i}}</h3> + <p>{{_i}}A list of items with no <code>list-style</code> or additional left padding.{{/i}}</p> + <div class="bs-docs-example"> + <ul class="unstyled"> + <li>Lorem ipsum dolor sit amet</li> + <li>Consectetur adipiscing elit</li> + <li>Integer molestie lorem at massa</li> + <li>Facilisis in pretium nisl aliquet</li> + <li>Nulla volutpat aliquam velit + <ul> + <li>Phasellus iaculis neque</li> + <li>Purus sodales ultricies</li> + <li>Vestibulum laoreet porttitor sem</li> + <li>Ac tristique libero volutpat at</li> + </ul> + </li> + <li>Faucibus porta lacus fringilla vel</li> + <li>Aenean sit amet erat nunc</li> + <li>Eget porttitor lorem</li> + </ul> + </div> +<pre class="prettyprint linenums"> +<ul class="unstyled"> + <li>...</li> +</ul> +</pre> <h3>{{_i}}Description{{/i}}</h3> - <p><code><dl></code></p> - <dl> - <dt>{{_i}}Description lists{{/i}}</dt> - <dd>{{_i}}A description list is perfect for defining terms.{{/i}}</dd> - <dt>Euismod</dt> - <dd>Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</dd> - <dd>Donec id elit non mi porta gravida at eget metus.</dd> - <dt>Malesuada porta</dt> - <dd>Etiam porta sem malesuada magna mollis euismod.</dd> - </dl> - - <h3>{{_i}}Horizontal description{{/i}}</h3> - <p><code><dl class="dl-horizontal"></code></p> - <dl class="dl-horizontal"> - <dt>{{_i}}Description lists{{/i}}</dt> - <dd>{{_i}}A description list is perfect for defining terms.{{/i}}</dd> - <dt>Euismod</dt> - <dd>Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</dd> - <dd>Donec id elit non mi porta gravida at eget metus.</dd> - <dt>Malesuada porta</dt> - <dd>Etiam porta sem malesuada magna mollis euismod.</dd> - <dt>Felis euismod semper eget lacinia</dt> - <dd>Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</dd> - </dl> + <p>{{_i}}A list of terms with their associated descriptions.{{/i}}</p> + <div class="bs-docs-example"> + <dl> + <dt>{{_i}}Description lists{{/i}}</dt> + <dd>{{_i}}A description list is perfect for defining terms.{{/i}}</dd> + <dt>Euismod</dt> + <dd>Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</dd> + <dd>Donec id elit non mi porta gravida at eget metus.</dd> + <dt>Malesuada porta</dt> + <dd>Etiam porta sem malesuada magna mollis euismod.</dd> + </dl> + </div> +<pre class="prettyprint linenums"> +<dl> + <dt>...</dt> + <dd>...</dd> +</dl> +</pre> + + <h4>{{_i}}Horizontal description{{/i}}</h4> + <p>{{_i}}Make terms and descriptions in <code><dl></code> line up side-by-side.{{/i}}</p> + <div class="bs-docs-example"> + <dl class="dl-horizontal"> + <dt>{{_i}}Description lists{{/i}}</dt> + <dd>{{_i}}A description list is perfect for defining terms.{{/i}}</dd> + <dt>Euismod</dt> + <dd>Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</dd> + <dd>Donec id elit non mi porta gravida at eget metus.</dd> + <dt>Malesuada porta</dt> + <dd>Etiam porta sem malesuada magna mollis euismod.</dd> + <dt>Felis euismod semper eget lacinia</dt> + <dd>Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</dd> + </dl> + </div> +<pre class="prettyprint linenums"> +<dl class="dl-horizontal"> + <dt>...</dt> + <dd>...</dd> +</dl> +</pre> <hr> <p> <span class="label label-info">{{_i}}Heads up!{{/i}}</span> diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index d2832e0fa..ae17ad4a8 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -1,26 +1,9 @@ -<div class="row"> - <div class="span3"> - <div class="bs-docs-contents well"> - <h3>{{_i}}Contents{{/i}}</h3> - <ol> - <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> - </ol> - </div> - </div> - <div class="span9"> - <!-- Masthead ================================================== --> <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="subnav"> <ul class="nav nav-pills"> <li><a href="#global">{{_i}}Global styles{{/i}}</a></li> @@ -34,6 +17,50 @@ --></header> +<!-- <section class="bs-docs-contents"> + <h3>{{_i}}Contents{{/i}}</h3> + <ol> + <li> + <a href="#global">{{_i}}Global styles{{/i}}</a> + <ul> + <li><a href="#global-1">{{_i}}Requires HTML5 doctype{{/i}}</a></li> + <li><a href="#global-2">{{_i}}Typography and links{{/i}}</a></li> + <li><a href="#global-3">{{_i}}Reset via Normalize{{/i}}</a></li> + </ul> + </li> + <li> + <a href="#gridSystem">{{_i}}Grid system{{/i}}</a> + <ul> + <li><a href="#gridSystem-1">{{_i}}Offsetting columns{{/i}}</a></li> + <li><a href="#gridSystem-2">{{_i}}Nesting columns{{/i}}</a></li> + </ul> + </li> + <li> + <a href="#fluidGridSystem">{{_i}}Fluid grid system{{/i}}</a> + <ul> + <li><a href="#fluidGridSystem-1">{{_i}}Nesting fluid columns{{/i}}</a></li> + </ul> + </li> + <li> + <a href="#gridCustomization">{{_i}}Grid Customization{{/i}}</a> + </li> + <li> + <a href="#layouts">{{_i}}Layouts{{/i}}</a> + <ul> + <li><a href="#layouts-1">{{_i}}Fixed layout{{/i}}</a></li> + <li><a href="#layouts-1">{{_i}}Fluid layout{{/i}}</a></li> + </ul> + </li> + <li> + <a href="#responsive">{{_i}}Responsive design{{/i}}</a> + <ul> + <li><a href="#responsive-1">{{_i}}Responsive utility classes{{/i}}</a></li> + <li><a href="#responsive-2">{{_i}}Responsive tests{{/i}}</a></li> + </ul> + </li> + </ol> +</section> + --> <!-- Global Bootstrap settings @@ -530,6 +557,3 @@ </ul> </section> - - </div> -</div>
\ No newline at end of file diff --git a/docs/upgrading.html b/docs/upgrading.html index 2a2c39818..a2da493ed 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -74,7 +74,7 @@ </div> </div> - <div class="container"> + <div class="bs-docs-container"> <!-- Masthead ================================================== --> @@ -275,10 +275,10 @@ <!-- 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 --> |