10 merge requests!14752.0 wip,!1403warningText and warningBackground docs fix,!13512.0 wip - relative font sizes,!1315[2.0-wip] Fix mustache glob when building,!1268[wip-2.0] IE 7/8 Typehead JS fix,!12362.0 wip - Fix for issue #1202,!1219Removed dotted outline on navbar dropdown menu,!1210Missing icon class from examples,!1195Fixed display of secondary container,!1153#1122 - i18n in Base CSS documentation
<pclass="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>
<h1>{{_i}}Base CSS{{/i}}</h1>
<pclass="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>
<h1>Typography <small>Headings, paragraphs, lists, and other inline type elements</small></h1>
<h1>{{_i}}Typography <small>Headings, paragraphs, lists, and other inline type elements</small>{{/i}}</h1>
</div>
<h2>Headings & body copy</h2>
<h2>{{_i}}Headings & body copy{{/i}}</h2>
<!-- Headings & Paragraph Copy -->
<divclass="row">
<divclass="span4">
<h3>Typographic scale</h3>
<p>The entire typographic grid is based on two Less variables in our preboot.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>
<h3>{{_i}}Typographic scale{{/i}}</h3>
<p>{{_i}}The entire typographic grid is based on two Less variables in our preboot.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>
<divclass="span4">
<h3>Example body text</h3>
<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 ut id elit.</p>
<p>Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui.</p>
</div>
<divclass="span4">
<divclass="well">
<h1>h1. Heading 1</h1>
<h2>h2. Heading 2</h2>
<h3>h3. Heading 3</h3>
<h4>h4. Heading 4</h4>
<h5>h5. Heading 5</h5>
<h6>h6. Heading 6</h6>
<h1>h1. {{_i}}Heading 1{{/i}}</h1>
<h2>h2. {{_i}}Heading 2{{/i}}</h2>
<h3>h3. {{_i}}Heading 3{{/i}}</h3>
<h4>h4. {{_i}}Heading 4{{/i}}</h4>
<h5>h5. {{_i}}Heading 5{{/i}}</h5>
<h6>h6. {{_i}}Heading 6{{/i}}</h6>
</div>
</div>
</div>
<!-- Misc Elements -->
<h2>Emphasis, address, and abbreviation</h2>
<h2>{{_i}}Emphasis, address, and abbreviation{{/i}}</h2>
<tableclass="table table-bordered table-striped">
<thead>
<tr>
<th>Element</th>
<th>Usage</th>
<th>Optional</th>
<th>{{_i}}Element{{/i}}</th>
<th>{{_i}}Usage{{/i}}</th>
<th>{{_i}}Optional{{/i}}</th>
</tr>
</thead>
<tbody>
...
...
@@ -62,10 +62,10 @@
<code><strong></code>
</td>
<td>
For emphasizing a snippet of text with <strong>important</strong>
{{_i}}For emphasizing a snippet of text with <strong>important</strong>{{/i}}
</td>
<td>
<spanclass="muted">None</span>
<spanclass="muted">{{_i}}None{{/i}}</span>
</td>
</tr>
<tr>
...
...
@@ -73,10 +73,10 @@
<code><em></code>
</td>
<td>
For emphasizing a snippet of text with <em>stress</em>
{{_i}}For emphasizing a snippet of text with <em>stress</em>{{/i}}
</td>
<td>
<spanclass="muted">None</span>
<spanclass="muted">{{_i}}None{{/i}}</span>
</td>
</tr>
<tr>
...
...
@@ -84,10 +84,10 @@
<code><abbr></code>
</td>
<td>
Wraps abbreviations and acronyms to show the expanded version on hover
{{_i}}Wraps abbreviations and acronyms to show the expanded version on hover{{/i}}
</td>
<td>
Include optional <code>title</code> for expanded text
{{_i}}Include optional <code>title</code> for expanded text{{/i}}
</td>
</tr>
<tr>
...
...
@@ -95,10 +95,10 @@
<code><address></code>
</td>
<td>
For contact information for its nearest ancestor or the entire body of work
{{_i}}For contact information for its nearest ancestor or the entire body of work{{/i}}
</td>
<td>
Preserve formatting by ending all lines with <code><br></code>
{{_i}}Preserve formatting by ending all lines with <code><br></code>{{/i}}
</td>
</tr>
</tbody>
...
...
@@ -106,13 +106,13 @@
<divclass="row">
<divclass="span4">
<h3>Using emphasis</h3>
<h3>{{_i}}Using emphasis{{/i}}</h3>
<p><ahref="#">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><b></code> and <code><i></code> in HTML5, but their usage has changed a bit. <code><b></code> is meant to highlight words or phrases without conveying additional importance while <code><i></code> is mostly for voice, technical terms, etc.</p>
<p>{{_i}}<strong>Note:</strong> Feel free to use <code><b></code> and <code><i></code> in HTML5, but their usage has changed a bit. <code><b></code> is meant to highlight words or phrases without conveying additional importance while <code><i></code> is mostly for voice, technical terms, etc.{{/i}}</p>
</div>
<divclass="span4">
<h3>Example addresses</h3>
<p>Here are two examples of how the <code><address></code> tag can be used:</p>
<h3>{{_i}}Example addresses{{/i}}</h3>
<p>{{_i}}Here are two examples of how the <code><address></code> tag can be used:{{/i}}</p>
<address>
<strong>Twitter, Inc.</strong><br>
795 Folsom Ave, Suite 600<br>
...
...
@@ -120,15 +120,15 @@
<abbrtitle="Phone">P:</abbr> (123) 456-7890
</address>
<address>
<strong>Full Name</strong><br>
<amailto="#">first.last@gmail.com</a>
<strong>{{_i}}Full Name{{/i}}</strong><br>
<amailto="#">{{_i}}first.last@gmail.com{{/i}}</a>
</address>
</div>
<divclass="span4">
<h3>Example abbreviations</h3>
<p>Abbreviations are styled with uppercase text and a light dotted bottom border. They also have a help cursor on hover so users have extra indication something will be shown on hover.</p>
<p><abbrtitle="HyperText Markup Language">HTML</abbr> is the best thing since sliced bread.</p>
<p>An abbreviation of the word attribute is <abbrtitle="attribute">attr</abbr>.</p>
<h3>{{_i}}Example abbreviations{{/i}}</h3>
<p>{{_i}}Abbreviations are styled with uppercase text and a light dotted bottom border. They also have a help cursor on hover so users have extra indication something will be shown on hover.{{/i}}</p>
<p>{{_i}}<abbrtitle="HyperText Markup Language">HTML</abbr> is the best thing since sliced bread.{{/i}}</p>
<p>{{_i}}An abbreviation of the word attribute is <abbrtitle="attribute">attr</abbr>.{{/i}}</p>
</div>
</div>
...
...
@@ -138,9 +138,9 @@
<tableclass="table table-bordered table-striped">
<thead>
<tr>
<th>Element</th>
<th>Usage</th>
<th>Optional</th>
<th>{{_i}}Element{{/i}}</th>
<th>{{_i}}Usage{{/i}}</th>
<th>{{_i}}Optional{{/i}}</th>
</tr>
</thead>
<tbody>
...
...
@@ -149,11 +149,11 @@
<code><blockquote></code>
</td>
<td>
Block-level element for quoting content from another source
{{_i}}Block-level element for quoting content from another source{{/i}}
</td>
<td>
<p>Add <code>cite</code> attribute for source URL</p>
Use <code>.pull-left</code> and <code>.pull-right</code> classes for floated options
<p>{{_i}}Add <code>cite</code> attribute for source URL{{/i}}</p>
{{_i}}Use <code>.pull-left</code> and <code>.pull-right</code> classes for floated options{{/i}}
</td>
</tr>
<tr>
...
...
@@ -161,53 +161,53 @@
<code><small></code>
</td>
<td>
Optional element for adding a user-facing citation, typically an author with title of work
{{_i}}Optional element for adding a user-facing citation, typically an author with title of work{{/i}}
</td>
<td>
Place the <code><cite></code> around the title or name of source
{{_i}}Place the <code><cite></code> around the title or name of source{{/i}}
</td>
</tr>
</tbody>
</table>
<divclass="row">
<divclass="span4">
<p>To include a blockquote, wrap <code><blockquote></code> around any <abbrtitle="HyperText Markup Language">HTML</abbr> as the quote. For straight quotes we recommend a <code><p></code>.</p>
<p>Include an optional <code><small></code> element to cite your source and you'll get an em dash <code>&mdash;</code> before it for styling purposes.</p>
<p>{{_i}}To include a blockquote, wrap <code><blockquote></code> around any <abbrtitle="HyperText Markup Language">HTML</abbr> as the quote. For straight quotes we recommend a <code><p></code>.{{/i}}</p>
<p>{{_i}}Include an optional <code><small></code> element to cite your source and you'll get an em dash <code>&mdash;</code> before it for styling purposes.{{/i}}</p>
</div>
<divclass="span8">
<preclass="prettyprint linenums">
<blockquote>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
<p>{{_i}}Default blockquotes are styled as such:{{/i}}</p>
<blockquote>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
<small>Someone famous in <citetitle="">Body of work</cite></small>
<small>{{_i}}Someone famous in <citetitle="">Body of work</cite>{{/i}}</small>
</blockquote>
</div>
<divclass="span6">
<p>To float your blockquote to the right, add <code>class="pull-right"</code>:</p>
<p>{{_i}}To float your blockquote to the right, add <code>class="pull-right"</code>:{{/i}}</p>
<blockquoteclass="pull-right">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
<small>Someone famous in <citetitle="">Body of work</cite></small>
<small>{{_i}}Someone famous in <citetitle="">Body of work</cite>{{/i}}</small>
</blockquote>
</div>
</div>
<!-- Lists -->
<h2>Lists</h2>
<h2>{{_i}}Lists{{/i}}</h2>
<divclass="row">
<divclass="span3">
<h4>Unordered</h4>
<h4>{{_i}}Unordered{{/i}}</h4>
<p><code><ul></code></p>
<ul>
<li>Lorem ipsum dolor sit amet</li>
...
...
@@ -228,7 +228,7 @@
</ul>
</div>
<divclass="span3">
<h4>Unstyled</h4>
<h4>{{_i}}Unstyled{{/i}}</h4>
<p><code><ul class="unstyled"></code></p>
<ulclass="unstyled">
<li>Lorem ipsum dolor sit amet</li>
...
...
@@ -249,7 +249,7 @@
</ul>
</div>
<divclass="span3">
<h4>Ordered</h4>
<h4>{{_i}}Ordered{{/i}}</h4>
<p><code><ol></code></p>
<ol>
<li>Lorem ipsum dolor sit amet</li>
...
...
@@ -263,11 +263,11 @@
</ol>
</div>
<divclass="span3">
<h4>Description</h4>
<h4>{{_i}}Description{{/i}}</h4>
<p><code><dl></code></p>
<dl>
<dt>Description lists</dt>
<dd>A description list is perfect for defining terms.</dd>
<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>
...
...
@@ -280,42 +280,42 @@
<!-- Code -->
<h2>Code <small>Inline and block</small></h2>
<h2>{{_i}}Code <small>Inline and block</small>{{/i}}</h2>
<tableclass="table table-bordered table-striped">
<thead>
<tr>
<thstyle="width: 190px;">Element</th>
<th>Result</th>
<thstyle="width: 190px;">{{_i}}Element{{/i}}</th>
<th>{{_i}}Result{{/i}}</th>
</tr>
</thead>
<tbody>
<tr>
<td><code><code></code></td>
<td>In a line of text like this, your wrapped code will look like this <code><html></code> element.</td>
<td>{{_i}}In a line of text like this, your wrapped code will look like this <code><html></code> element.{{/i}}</td>
</tr>
<tr>
<td><code><pre></code></td>
<td>
<pre><div>
<h1>Heading</h1>
<p>Something right here...</p>
<h1>{{_i}}Heading{{/i}}</h1>
<p>{{_i}}Something right here…{{/i}}</p>
</div></pre>
<p><strong>Note:</strong> Be sure to keep code within <code><pre></code> tags as close to the left as possible; it will render all tabs.</p>
<p>{{_i}}<strong>Note:</strong> Be sure to keep code within <code><pre></code> tags as close to the left as possible; it will render all tabs.{{/i}}</p>
<p>Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.</p>
<p>{{_i}}Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.{{/i}}</p>
<preclass="prettyprint"><div>
<h1>Heading</h1>
<p>Something right here...</p>
<h1>{{_i}}Heading{{/i}}</h1>
<p>{{_i}}Something right here…{{/i}}</p>
</div></pre>
<preclass="prettyprint linenums"><div>
<h1>Heading</h1>
<p>Something right here...</p>
<h1>{{_i}}Heading{{/i}}</h1>
<p>{{_i}}Something right here…{{/i}}</p>
</div></pre>
<p><ahref="http://code.google.com/p/google-code-prettify/">Download google-code-prettify</a> and view the readme for <ahref="http://google-code-prettify.googlecode.com/svn/trunk/README.html">how to use</a>.</p>
<p>{{_i}}<ahref="http://code.google.com/p/google-code-prettify/">Download google-code-prettify</a> and view the readme for <ahref="http://google-code-prettify.googlecode.com/svn/trunk/README.html">how to use</a>.{{/i}}</p>