rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '2.1.2-wip' into exploratory

Browse source 
Conflicts:
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
This commit is contained in:
Mark Otto 2012-09-30 22:45:39 -07:00
commit bbd543db53
14 changed files with 437 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/base-css.html
View file

@ -153,14 +153,14 @@
</pre>
<h3>Bold</h3>
<p>For emphasizing a snippet of text with <strong>important</strong></p>
<p>For emphasizing a snippet of text with a heavier font-weight.</p>
<div class="bs-docs-example">
<p>The following snippet of text is <strong>rendered as bold text</strong>.</p>
</div>
<pre class="prettyprint">&lt;strong&gt;rendered as bold text&lt;/strong&gt;</pre>
<h3>Italics</h3>
<p>For emphasizing a snippet of text with <em>stress</em></p>
<p>For emphasizing a snippet of text with italics.</p>
<div class="bs-docs-example">
<p>The following snippet of text is <em>rendered as italicized text</em>.</p>
</div>
@ -507,7 +507,7 @@ For example, &lt;code&gt;&lt;section&gt;&lt;/code&gt; should be wrapped as inlin
<h2>Optional classes</h2>
<p>Add any of the follow classes to the <code>.table</code> base class.</p>
<p>Add any of the following classes to the <code>.table</code> base class.</p>
<h3><code>.table-striped</code></h3>
<p>Adds zebra-striping to any table row within the <code>&lt;tbody&gt;</code> via the <code>:nth-child</code> CSS selector (not available in IE8).</p>