Skip to content

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

revamp docs to have new width, start realigning the base css page to match

parent 632c6d22
Show whitespace changes
Inline Side-by-side
Showing with 351 additions and 353 deletions
docs/assets/css/docs.css
View file @ c44bd1ed
...@@ -17,6 +17,10 @@ body { ...@@ -17,6 +17,10 @@ body {
background-position: 0 40px; background-position: 0 40px;
} }
.bs-docs-container {
max-width: 780px;
margin: 0 auto;
}
/* Tweak navbar brand link to be super sleek /* Tweak navbar brand link to be super sleek
-------------------------------------------------- */ -------------------------------------------------- */
...@@ -571,7 +575,7 @@ form.well { ...@@ -571,7 +575,7 @@ form.well {
margin: 15px 0; margin: 15px 0;
padding: 39px 19px 14px; padding: 39px 19px 14px;
background-color: #fff; background-color: #fff;
border: 1px solid #e5e5e5; border: 1px solid #ddd;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
...@@ -582,11 +586,10 @@ form.well { ...@@ -582,11 +586,10 @@ form.well {
top: -1px; top: -1px;
left: -1px; left: -1px;
padding: 3px 7px; padding: 3px 7px;
font-family: "Open Sans", sans-serif;
font-size: 12px; font-size: 12px;
font-weight: bold; font-weight: bold;
background-color: #f5f5f5; background-color: #f5f5f5;
border: 1px solid #e5e5e5; border: 1px solid #ddd;
color: #9da0a4; color: #9da0a4;
-webkit-border-radius: 4px 0 4px 0; -webkit-border-radius: 4px 0 4px 0;
-moz-border-radius: 4px 0 4px 0; -moz-border-radius: 4px 0 4px 0;
......
docs/base-css.html
View file @ c44bd1ed
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</div> </div>
</div> </div>
<div class="container"> <div class="bs-docs-container">
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
...@@ -101,24 +101,9 @@ ...@@ -101,24 +101,9 @@
<h1>Typography <small>Headings, paragraphs, lists, and other inline type elements</small></h1> <h1>Typography <small>Headings, paragraphs, lists, and other inline type elements</small></h1>
</div> </div>
<h2>Headings &amp; body copy</h2> <h2>Headings</h2>
<p>All HTML headings, <code>&lt;h1&gt;</code> through <code>&lt;h6&gt;</code> are available.</p>
<!-- Headings & Paragraph Copy --> <div class="bs-docs-example">
<div class="row">
<div class="span4">
<h3>Typographic scale</h3>
<p>The entire typographic grid is based on two Less variables in our variables.less file: <code>@baseFontSize</code> and <code>@baseLineHeight</code>. The first is the base font-size used throughout and the second is the base line-height.</p>
<p>We use those variables, and some math, to create the margins, paddings, and line-heights of all our type and more.</p>
</div>
<div class="span4">
<h3>Example body text</h3>
<p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.</p>
<h3>Lead body copy</h3>
<p>Make a paragraph stand out by adding <code>.lead</code>.</p>
<p class="lead">Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.</p>
</div>
<div class="span4">
<div class="well">
<h1>h1. Heading 1</h1> <h1>h1. Heading 1</h1>
<h2>h2. Heading 2</h2> <h2>h2. Heading 2</h2>
<h3>h3. Heading 3</h3> <h3>h3. Heading 3</h3>
...@@ -126,10 +111,27 @@ ...@@ -126,10 +111,27 @@
<h5>h5. Heading 5</h5> <h5>h5. Heading 5</h5>
<h6>h6. Heading 6</h6> <h6>h6. Heading 6</h6>
</div> </div>
<h2>Body copy</h2>
<p>Bootstrap's global default <code>font-size</code> is <strong>13px</strong>, with a <code>line-height</code> of <strong>18px</strong>. This is applied to the <code>&lt;body&gt;</code> and all paragraphs. In addition, <code>&lt;p&gt;</code> (paragraphs) receive a bottom margin of half their line-height (9px by default).</p>
<div class="bs-docs-example">
<p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.</p>
<p>Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.</p>
<p>Maecenas sed diam eget risus varius blandit sit amet non magna. Donec id elit non mi porta gravida at eget metus. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
</div> </div>
<h2>Lead body copy</h2>
<p>Make a paragraph stand out by adding <code>.lead</code>.</p>
<div class="bs-docs-example">
<p class="lead">Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.</p>
</div> </div>
<!-- Misc Elements --> <h2>Built with Less</h2>
<p>The typographic scale is based on two Less variables in variables.less file: <code>@baseFontSize</code> and <code>@baseLineHeight</code>. The first is the base font-size used throughout and the second is the base line-height.</p>
<p>We use those variables, and some math, to create the margins, paddings, and line-heights of all our type and more. Customize them and watch Bootstrap adapt as you go.</p>
<hr>
<h2>Emphasis, address, and abbreviation</h2> <h2>Emphasis, address, and abbreviation</h2>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
...@@ -188,15 +190,15 @@ ...@@ -188,15 +190,15 @@
</tbody> </tbody>
</table> </table>
<div class="row">
<div class="span4">
<h3>Using emphasis</h3> <h3>Using emphasis</h3>
<div class="bs-docs-example">
<p><a href="#">Fusce dapibus</a>, <strong>tellus ac cursus commodo</strong>, <em>tortor mauris condimentum nibh</em>, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.</p> <p><a href="#">Fusce dapibus</a>, <strong>tellus ac cursus commodo</strong>, <em>tortor mauris condimentum nibh</em>, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.</p>
<p><strong>Note:</strong> Feel free to use <code>&lt;b&gt;</code> and <code>&lt;i&gt;</code> in HTML5, but their usage has changed a bit. <code>&lt;b&gt;</code> is meant to highlight words or phrases without conveying additional importance while <code>&lt;i&gt;</code> is mostly for voice, technical terms, etc.</p>
</div> </div>
<div class="span4"> <p><strong>Note:</strong> Feel free to use <code>&lt;b&gt;</code> and <code>&lt;i&gt;</code> in HTML5. <code>&lt;b&gt;</code> is meant to highlight words or phrases without conveying additional importance while <code>&lt;i&gt;</code> is mostly for voice, technical terms, etc.</p>
<h3>Example addresses</h3> <h3>Example addresses</h3>
<p>Here are two examples of how the <code>&lt;address&gt;</code> tag can be used:</p> <p>Here are two examples of how the <code>&lt;address&gt;</code> tag can be used:</p>
<div class="bs-docs-example">
<address> <address>
<strong>Twitter, Inc.</strong><br> <strong>Twitter, Inc.</strong><br>
795 Folsom Ave, Suite 600<br> 795 Folsom Ave, Suite 600<br>
...@@ -208,17 +210,19 @@ ...@@ -208,17 +210,19 @@
<a href="mailto:#">first.last@gmail.com</a> <a href="mailto:#">first.last@gmail.com</a>
</address> </address>
</div> </div>
<div class="span4">
<h3>Example abbreviations</h3> <h3>Example abbreviations</h3>
<p>Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover. This gives users extra indication something will be shown on hover.</p> <p>Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover. This gives users extra indication something will be shown on hover.</p>
<p>Add the <code>initialism</code> class to an abbreviation to increase typographic harmony by giving it a slightly smaller text size.</p> <div class="bs-docs-example">
<p><abbr title="HyperText Markup Language" class="initialism">HTML</abbr> is the best thing since sliced bread.</p>
<p>An abbreviation of the word attribute is <abbr title="attribute">attr</abbr>.</p> <p>An abbreviation of the word attribute is <abbr title="attribute">attr</abbr>.</p>
</div> </div>
<p>Add the <code>initialism</code> class to an abbreviation for a slightly smaller font-size.</p>
<div class="bs-docs-example">
<p><abbr title="HyperText Markup Language" class="initialism">HTML</abbr> is the best thing since sliced bread.</p>
</div> </div>
<hr>
<!-- Blockquotes -->
<h2>Blockquotes</h2> <h2>Blockquotes</h2>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
...@@ -254,46 +258,38 @@ ...@@ -254,46 +258,38 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="row">
<div class="span4">
<p>To include a blockquote, wrap <code>&lt;blockquote&gt;</code> around any <abbr title="HyperText Markup Language">HTML</abbr> as the quote. For straight quotes we recommend a <code>&lt;p&gt;</code>.</p> <p>To include a blockquote, wrap <code>&lt;blockquote&gt;</code> around any <abbr title="HyperText Markup Language">HTML</abbr> as the quote. For straight quotes we recommend a <code>&lt;p&gt;</code>.</p>
<p>Include an optional <code>&lt;small&gt;</code> element to cite your source and you'll get an em dash <code>&amp;mdash;</code> before it for styling purposes.</p> <p>Include an optional <code>&lt;small&gt;</code> element to cite your source and you'll get an em dash <code>&amp;mdash;</code> before it for styling purposes.</p>
</div>
<div class="span8">
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;blockquote&gt; &lt;blockquote&gt;
&lt;p&gt;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.&lt;/p&gt; &lt;p&gt;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.&lt;/p&gt;
&lt;small&gt;Someone famous&lt;/small&gt; &lt;small&gt;Someone famous&lt;/small&gt;
&lt;/blockquote&gt; &lt;/blockquote&gt;
</pre> </pre>
</div>
</div><!--/row-->
<h3>Example blockquotes</h3> <h3>Example blockquotes</h3>
<div class="row">
<div class="span6">
<p>Default blockquotes are styled as such:</p> <p>Default blockquotes are styled as such:</p>
<div class="bs-docs-example">
<blockquote> <blockquote>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p> <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
<small>Someone famous in <cite title="">Body of work</cite></small> <small>Someone famous in <cite title="">Body of work</cite></small>
</blockquote> </blockquote>
</div> </div>
<div class="span6">
<p>To float your blockquote to the right, add <code>class="pull-right"</code>:</p> <p>To float your blockquote to the right, add <code>class="pull-right"</code>:</p>
<div class="bs-docs-example">
<blockquote class="pull-right"> <blockquote class="pull-right">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p> <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
<small>Someone famous in <cite title="">Body of work</cite></small> <small>Someone famous in <cite title="">Body of work</cite></small>
</blockquote> </blockquote>
</div> </div>
</div>
<hr>
<!-- Lists --> <!-- Lists -->
<h2>Lists</h2> <h2>Lists</h2>
<div class="row">
<div class="span4">
<h3>Unordered</h3> <h3>Unordered</h3>
<p><code>&lt;ul&gt;</code></p> <p>A list of items in which the order does not explicitly matter.</p>
<div class="bs-docs-example">
<ul> <ul>
<li>Lorem ipsum dolor sit amet</li> <li>Lorem ipsum dolor sit amet</li>
<li>Consectetur adipiscing elit</li> <li>Consectetur adipiscing elit</li>
...@@ -312,7 +308,12 @@ ...@@ -312,7 +308,12 @@
<li>Eget porttitor lorem</li> <li>Eget porttitor lorem</li>
</ul> </ul>
</div> </div>
<div class="span4"> <pre class="prettyprint linenums">
&lt;ul&gt;
&lt;li&gt;...&lt;/li&gt;
&lt;/ul&gt;
</pre>
<h3>Unstyled</h3> <h3>Unstyled</h3>
<p><code>&lt;ul class="unstyled"&gt;</code></p> <p><code>&lt;ul class="unstyled"&gt;</code></p>
<ul class="unstyled"> <ul class="unstyled">
...@@ -332,8 +333,7 @@ ...@@ -332,8 +333,7 @@
<li>Aenean sit amet erat nunc</li> <li>Aenean sit amet erat nunc</li>
<li>Eget porttitor lorem</li> <li>Eget porttitor lorem</li>
</ul> </ul>
</div>
<div class="span4">
<h3>Ordered</h3> <h3>Ordered</h3>
<p><code>&lt;ol&gt;</code></p> <p><code>&lt;ol&gt;</code></p>
<ol> <ol>
...@@ -346,11 +346,7 @@ ...@@ -346,11 +346,7 @@
<li>Aenean sit amet erat nunc</li> <li>Aenean sit amet erat nunc</li>
<li>Eget porttitor lorem</li> <li>Eget porttitor lorem</li>
</ol> </ol>
</div>
</div><!-- /row -->
<br>
<div class="row">
<div class="span4">
<h3>Description</h3> <h3>Description</h3>
<p><code>&lt;dl&gt;</code></p> <p><code>&lt;dl&gt;</code></p>
<dl> <dl>
...@@ -362,8 +358,7 @@ ...@@ -362,8 +358,7 @@
<dt>Malesuada porta</dt> <dt>Malesuada porta</dt>
<dd>Etiam porta sem malesuada magna mollis euismod.</dd> <dd>Etiam porta sem malesuada magna mollis euismod.</dd>
</dl> </dl>
</div>
<div class="span8">
<h3>Horizontal description</h3> <h3>Horizontal description</h3>
<p><code>&lt;dl class="dl-horizontal"&gt;</code></p> <p><code>&lt;dl class="dl-horizontal"&gt;</code></p>
<dl class="dl-horizontal"> <dl class="dl-horizontal">
...@@ -382,8 +377,6 @@ ...@@ -382,8 +377,6 @@
<span class="label label-info">Heads up!</span> <span class="label label-info">Heads up!</span>
Horizontal description lists will truncate terms that are too long to fit in the left column fix <code>text-overflow</code>. In narrower viewports, they will change to the default stacked layout. Horizontal description lists will truncate terms that are too long to fit in the left column fix <code>text-overflow</code>. In narrower viewports, they will change to the default stacked layout.
</p> </p>
</div>
</div><!-- /row -->
</section> </section>
......
docs/components.html
View file @ c44bd1ed
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</div> </div>
</div> </div>
<div class="container"> <div class="bs-docs-container">
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
......
docs/download.html
View file @ c44bd1ed
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</div> </div>
</div> </div>
<div class="container"> <div class="bs-docs-container">
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
......
docs/examples.html
View file @ c44bd1ed
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</div> </div>
</div> </div>
<div class="container"> <div class="bs-docs-container">
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
......
docs/index.html
View file @ c44bd1ed
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</div> </div>
</div> </div>
<div class="container"> <div class="bs-docs-container">
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
......
docs/javascript.html
View file @ c44bd1ed
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</div> </div>
</div> </div>
<div class="container"> <div class="bs-docs-container">
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
......
docs/less.html
View file @ c44bd1ed
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</div> </div>
</div> </div>
<div class="container"> <div class="bs-docs-container">
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
......
docs/scaffolding.html
View file @ c44bd1ed
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</div> </div>
</div> </div>
<div class="container"> <div class="bs-docs-container">
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
......
docs/templates/layout.mustache
View file @ c44bd1ed
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
</div> </div>
</div> </div>
<div class="container"> <div class="bs-docs-container">
{{>body}} {{>body}}
......
docs/templates/pages/base-css.mustache
View file @ c44bd1ed
...@@ -23,24 +23,10 @@ ...@@ -23,24 +23,10 @@
<h1>{{_i}}Typography <small>Headings, paragraphs, lists, and other inline type elements</small>{{/i}}</h1> <h1>{{_i}}Typography <small>Headings, paragraphs, lists, and other inline type elements</small>{{/i}}</h1>
</div> </div>
<h2>{{_i}}Headings &amp; body copy{{/i}}</h2> {{! Headings }}
<h2>{{_i}}Headings{{/i}}</h2>
<!-- Headings & Paragraph Copy --> <p>{{_i}}All HTML headings, <code>&lt;h1&gt;</code> through <code>&lt;h6&gt;</code> are available.{{/i}}</p>
<div class="row"> <div class="bs-docs-example">
<div class="span4">
<h3>{{_i}}Typographic scale{{/i}}</h3>
<p>{{_i}}The entire typographic grid is based on two Less variables in our variables.less file: <code>@baseFontSize</code> and <code>@baseLineHeight</code>. The first is the base font-size used throughout and the second is the base line-height.{{/i}}</p>
<p>{{_i}}We use those variables, and some math, to create the margins, paddings, and line-heights of all our type and more.{{/i}}</p>
</div>
<div class="span4">
<h3>{{_i}}Example body text{{/i}}</h3>
<p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.</p>
<h3>{{_i}}Lead body copy{{/i}}</h3>
<p>{{_i}}Make a paragraph stand out by adding <code>.lead</code>.{{/i}}</p>
<p class="lead">Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.</p>
</div>
<div class="span4">
<div class="well">
<h1>h1. {{_i}}Heading 1{{/i}}</h1> <h1>h1. {{_i}}Heading 1{{/i}}</h1>
<h2>h2. {{_i}}Heading 2{{/i}}</h2> <h2>h2. {{_i}}Heading 2{{/i}}</h2>
<h3>h3. {{_i}}Heading 3{{/i}}</h3> <h3>h3. {{_i}}Heading 3{{/i}}</h3>
...@@ -48,10 +34,31 @@ ...@@ -48,10 +34,31 @@
<h5>h5. {{_i}}Heading 5{{/i}}</h5> <h5>h5. {{_i}}Heading 5{{/i}}</h5>
<h6>h6. {{_i}}Heading 6{{/i}}</h6> <h6>h6. {{_i}}Heading 6{{/i}}</h6>
</div> </div>
{{! Body copy }}
<h2>{{_i}}Body copy{{/i}}</h2>
<p>{{_i}}Bootstrap's global default <code>font-size</code> is <strong>13px</strong>, with a <code>line-height</code> of <strong>18px</strong>. This is applied to the <code>&lt;body&gt;</code> and all paragraphs. In addition, <code>&lt;p&gt;</code> (paragraphs) receive a bottom margin of half their line-height (9px by default).{{/i}}</p>
<div class="bs-docs-example">
<p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.</p>
<p>Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.</p>
<p>Maecenas sed diam eget risus varius blandit sit amet non magna. Donec id elit non mi porta gravida at eget metus. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
</div> </div>
{{! Body copy .lead }}
<h2>{{_i}}Lead body copy{{/i}}</h2>
<p>{{_i}}Make a paragraph stand out by adding <code>.lead</code>.{{/i}}</p>
<div class="bs-docs-example">
<p class="lead">Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.</p>
</div> </div>
<!-- Misc Elements --> {{! Using LESS }}
<h2>{{_i}}Built with Less{{/i}}</h2>
<p>{{_i}}The typographic scale is based on two Less variables in variables.less file: <code>@baseFontSize</code> and <code>@baseLineHeight</code>. The first is the base font-size used throughout and the second is the base line-height.{{/i}}</p>
<p>{{_i}}We use those variables, and some math, to create the margins, paddings, and line-heights of all our type and more. Customize them and watch Bootstrap adapt as you go.{{/i}}</p>
<hr>
{{! Misc Elements }}
<h2>{{_i}}Emphasis, address, and abbreviation{{/i}}</h2> <h2>{{_i}}Emphasis, address, and abbreviation{{/i}}</h2>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
...@@ -110,15 +117,17 @@ ...@@ -110,15 +117,17 @@
</tbody> </tbody>
</table> </table>
<div class="row"> {{! Emphasis }}
<div class="span4">
<h3>{{_i}}Using emphasis{{/i}}</h3> <h3>{{_i}}Using emphasis{{/i}}</h3>
<div class="bs-docs-example">
<p><a href="#">Fusce dapibus</a>, <strong>tellus ac cursus commodo</strong>, <em>tortor mauris condimentum nibh</em>, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.</p> <p><a href="#">Fusce dapibus</a>, <strong>tellus ac cursus commodo</strong>, <em>tortor mauris condimentum nibh</em>, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.</p>
<p>{{_i}}<strong>Note:</strong> Feel free to use <code>&lt;b&gt;</code> and <code>&lt;i&gt;</code> in HTML5, but their usage has changed a bit. <code>&lt;b&gt;</code> is meant to highlight words or phrases without conveying additional importance while <code>&lt;i&gt;</code> is mostly for voice, technical terms, etc.{{/i}}</p>
</div> </div>
<div class="span4"> <p>{{_i}}<strong>Note:</strong> Feel free to use <code>&lt;b&gt;</code> and <code>&lt;i&gt;</code> in HTML5. <code>&lt;b&gt;</code> is meant to highlight words or phrases without conveying additional importance while <code>&lt;i&gt;</code> is mostly for voice, technical terms, etc.{{/i}}</p>
{{! Addresses }}
<h3>{{_i}}Example addresses{{/i}}</h3> <h3>{{_i}}Example addresses{{/i}}</h3>
<p>{{_i}}Here are two examples of how the <code>&lt;address&gt;</code> tag can be used:{{/i}}</p> <p>{{_i}}Here are two examples of how the <code>&lt;address&gt;</code> tag can be used:{{/i}}</p>
<div class="bs-docs-example">
<address> <address>
<strong>Twitter, Inc.</strong><br> <strong>Twitter, Inc.</strong><br>
795 Folsom Ave, Suite 600<br> 795 Folsom Ave, Suite 600<br>
...@@ -130,17 +139,21 @@ ...@@ -130,17 +139,21 @@
<a href="mailto:#">{{_i}}first.last@gmail.com{{/i}}</a> <a href="mailto:#">{{_i}}first.last@gmail.com{{/i}}</a>
</address> </address>
</div> </div>
<div class="span4">
{{! Abbreviations }}
<h3>{{_i}}Example abbreviations{{/i}}</h3> <h3>{{_i}}Example abbreviations{{/i}}</h3>
<p>{{_i}}Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover. This gives users extra indication something will be shown on hover.{{/i}}</p> <p>{{_i}}Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover. This gives users extra indication something will be shown on hover.{{/i}}</p>
<p>{{_i}}Add the <code>initialism</code> class to an abbreviation to increase typographic harmony by giving it a slightly smaller text size.{{/i}}</p> <div class="bs-docs-example">
<p>{{_i}}<abbr title="HyperText Markup Language" class="initialism">HTML</abbr> is the best thing since sliced bread.{{/i}}</p>
<p>{{_i}}An abbreviation of the word attribute is <abbr title="attribute">attr</abbr>.{{/i}}</p> <p>{{_i}}An abbreviation of the word attribute is <abbr title="attribute">attr</abbr>.{{/i}}</p>
</div> </div>
<p>{{_i}}Add the <code>initialism</code> class to an abbreviation for a slightly smaller font-size.{{/i}}</p>
<div class="bs-docs-example">
<p>{{_i}}<abbr title="HyperText Markup Language" class="initialism">HTML</abbr> is the best thing since sliced bread.{{/i}}</p>
</div> </div>
<hr>
<!-- Blockquotes --> {{! Blockquotes }}
<h2>{{_i}}Blockquotes{{/i}}</h2> <h2>{{_i}}Blockquotes{{/i}}</h2>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
...@@ -176,46 +189,38 @@ ...@@ -176,46 +189,38 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="row">
<div class="span4">
<p>{{_i}}To include a blockquote, wrap <code>&lt;blockquote&gt;</code> around any <abbr title="HyperText Markup Language">HTML</abbr> as the quote. For straight quotes we recommend a <code>&lt;p&gt;</code>.{{/i}}</p> <p>{{_i}}To include a blockquote, wrap <code>&lt;blockquote&gt;</code> around any <abbr title="HyperText Markup Language">HTML</abbr> as the quote. For straight quotes we recommend a <code>&lt;p&gt;</code>.{{/i}}</p>
<p>{{_i}}Include an optional <code>&lt;small&gt;</code> element to cite your source and you'll get an em dash <code>&amp;mdash;</code> before it for styling purposes.{{/i}}</p> <p>{{_i}}Include an optional <code>&lt;small&gt;</code> element to cite your source and you'll get an em dash <code>&amp;mdash;</code> before it for styling purposes.{{/i}}</p>
</div>
<div class="span8">
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;blockquote&gt; &lt;blockquote&gt;
&lt;p&gt;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.&lt;/p&gt; &lt;p&gt;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.&lt;/p&gt;
&lt;small&gt;{{_i}}Someone famous{{/i}}&lt;/small&gt; &lt;small&gt;{{_i}}Someone famous{{/i}}&lt;/small&gt;
&lt;/blockquote&gt; &lt;/blockquote&gt;
</pre> </pre>
</div>
</div><!--/row-->
<h3>{{_i}}Example blockquotes{{/i}}</h3> <h3>{{_i}}Example blockquotes{{/i}}</h3>
<div class="row">
<div class="span6">
<p>{{_i}}Default blockquotes are styled as such:{{/i}}</p> <p>{{_i}}Default blockquotes are styled as such:{{/i}}</p>
<div class="bs-docs-example">
<blockquote> <blockquote>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p> <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
<small>{{_i}}Someone famous in <cite title="">Body of work</cite>{{/i}}</small> <small>{{_i}}Someone famous in <cite title="">Body of work</cite>{{/i}}</small>
</blockquote> </blockquote>
</div> </div>
<div class="span6">
<p>{{_i}}To float your blockquote to the right, add <code>class="pull-right"</code>:{{/i}}</p> <p>{{_i}}To float your blockquote to the right, add <code>class="pull-right"</code>:{{/i}}</p>
<div class="bs-docs-example">
<blockquote class="pull-right"> <blockquote class="pull-right">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p> <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
<small>{{_i}}Someone famous in <cite title="">Body of work</cite>{{/i}}</small> <small>{{_i}}Someone famous in <cite title="">Body of work</cite>{{/i}}</small>
</blockquote> </blockquote>
</div> </div>
</div>
<hr>
<!-- Lists --> <!-- Lists -->
<h2>{{_i}}Lists{{/i}}</h2> <h2>{{_i}}Lists{{/i}}</h2>
<div class="row">
<div class="span4">
<h3>{{_i}}Unordered{{/i}}</h3> <h3>{{_i}}Unordered{{/i}}</h3>
<p><code>&lt;ul&gt;</code></p> <p>{{_i}}A list of items in which the order does not explicitly matter.{{/i}}</p>
<div class="bs-docs-example">
<ul> <ul>
<li>Lorem ipsum dolor sit amet</li> <li>Lorem ipsum dolor sit amet</li>
<li>Consectetur adipiscing elit</li> <li>Consectetur adipiscing elit</li>
...@@ -234,7 +239,12 @@ ...@@ -234,7 +239,12 @@
<li>Eget porttitor lorem</li> <li>Eget porttitor lorem</li>
</ul> </ul>
</div> </div>
<div class="span4"> <pre class="prettyprint linenums">
&lt;ul&gt;
&lt;li&gt;...&lt;/li&gt;
&lt;/ul&gt;
</pre>
<h3>{{_i}}Unstyled{{/i}}</h3> <h3>{{_i}}Unstyled{{/i}}</h3>
<p><code>&lt;ul class="unstyled"&gt;</code></p> <p><code>&lt;ul class="unstyled"&gt;</code></p>
<ul class="unstyled"> <ul class="unstyled">
...@@ -254,8 +264,7 @@ ...@@ -254,8 +264,7 @@
<li>Aenean sit amet erat nunc</li> <li>Aenean sit amet erat nunc</li>
<li>Eget porttitor lorem</li> <li>Eget porttitor lorem</li>
</ul> </ul>
</div>
<div class="span4">
<h3>{{_i}}Ordered{{/i}}</h3> <h3>{{_i}}Ordered{{/i}}</h3>
<p><code>&lt;ol&gt;</code></p> <p><code>&lt;ol&gt;</code></p>
<ol> <ol>
...@@ -268,11 +277,7 @@ ...@@ -268,11 +277,7 @@
<li>Aenean sit amet erat nunc</li> <li>Aenean sit amet erat nunc</li>
<li>Eget porttitor lorem</li> <li>Eget porttitor lorem</li>
</ol> </ol>
</div>
</div><!-- /row -->
<br>
<div class="row">
<div class="span4">
<h3>{{_i}}Description{{/i}}</h3> <h3>{{_i}}Description{{/i}}</h3>
<p><code>&lt;dl&gt;</code></p> <p><code>&lt;dl&gt;</code></p>
<dl> <dl>
...@@ -284,8 +289,7 @@ ...@@ -284,8 +289,7 @@
<dt>Malesuada porta</dt> <dt>Malesuada porta</dt>
<dd>Etiam porta sem malesuada magna mollis euismod.</dd> <dd>Etiam porta sem malesuada magna mollis euismod.</dd>
</dl> </dl>
</div>
<div class="span8">
<h3>{{_i}}Horizontal description{{/i}}</h3> <h3>{{_i}}Horizontal description{{/i}}</h3>
<p><code>&lt;dl class="dl-horizontal"&gt;</code></p> <p><code>&lt;dl class="dl-horizontal"&gt;</code></p>
<dl class="dl-horizontal"> <dl class="dl-horizontal">
...@@ -304,8 +308,6 @@ ...@@ -304,8 +308,6 @@
<span class="label label-info">{{_i}}Heads up!{{/i}}</span> <span class="label label-info">{{_i}}Heads up!{{/i}}</span>
{{_i}}Horizontal description lists will truncate terms that are too long to fit in the left column fix <code>text-overflow</code>. In narrower viewports, they will change to the default stacked layout.{{/i}} {{_i}}Horizontal description lists will truncate terms that are too long to fit in the left column fix <code>text-overflow</code>. In narrower viewports, they will change to the default stacked layout.{{/i}}
</p> </p>
</div>
</div><!-- /row -->
</section> </section>
......
docs/upgrading.html
View file @ c44bd1ed
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</div> </div>
</div> </div>
<div class="container"> <div class="bs-docs-container">
<!-- Masthead <!-- Masthead
================================================== --> ================================================== -->
......
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