github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-02-07 12:35:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

more tweaks to layouts and some docs styles

Browse Source
This commit is contained in:
Mark Otto
2012-06-05 17:16:17 -07:00
parent dd127611e1
commit 22918f8f92
13 changed files with 321 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/templates/layout.mustache vendored
View File

@@ -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 -->

158
docs/templates/pages/base-css.mustache vendored
View File

@@ -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 @@
&lt;/ul&gt;
</pre>
<h3>{{_i}}Unstyled{{/i}}</h3>
<p><code>&lt;ul class="unstyled"&gt;</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>&lt;ol&gt;</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">
&lt;ol&gt;
&lt;li&gt;...&lt;/li&gt;
&lt;/ol&gt;
</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">
&lt;ul class="unstyled"&gt;
&lt;li&gt;...&lt;/li&gt;
&lt;/ul&gt;
</pre>
<h3>{{_i}}Description{{/i}}</h3>
<p><code>&lt;dl&gt;</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>
<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">
&lt;dl&gt;
&lt;dt&gt;...&lt;/dt&gt;
&lt;dd&gt;...&lt;/dd&gt;
&lt;/dl&gt;
</pre>
<h3>{{_i}}Horizontal description{{/i}}</h3>
<p><code>&lt;dl class="dl-horizontal"&gt;</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>
<h4>{{_i}}Horizontal description{{/i}}</h4>
<p>{{_i}}Make terms and descriptions in <code>&lt;dl&gt;</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">
&lt;dl class="dl-horizontal"&gt;
&lt;dt&gt;...&lt;/dt&gt;
&lt;dd&gt;...&lt;/dd&gt;
&lt;/dl&gt;
</pre>
<hr>
<p>
<span class="label label-info">{{_i}}Heads up!{{/i}}</span>

64
docs/templates/pages/scaffolding.mustache vendored
View File

@@ -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>