root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

This commit is contained in:
Mark Otto 2013-08-18 11:08:29 -07:00
parent ef4590dfb4 0cbffb3bcb
commit b5ac1b065e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_includes/nav-components.html
View File

@ -2,7 +2,7 @@
<a href="#glyphicons">Glyphicons</a> <a href="#glyphicons">Glyphicons</a>
<ul class="nav"> <ul class="nav">
<li><a href="#glyphicons-glyphs">Available glyphs</a></li> <li><a href="#glyphicons-glyphs">Available glyphs</a></li>
<li><a href="#glyphicons-how-to-use">How ot use</a></li> <li><a href="#glyphicons-how-to-use">How to use</a></li>
<li><a href="#glyphicons-examples">Examples</a></li> <li><a href="#glyphicons-examples">Examples</a></li>
</ul> </ul>
</li> </li>

2
components.html
View File

@ -244,7 +244,7 @@ base_url: "../"
</ul> </ul>
<h2 id="glyphicons-how-to">How to use</h2> <h2 id="glyphicons-how-to-use">How to use</h2>
<p>For performance reasons, all icons require a base class and individual icon class. To use, place the following code just about anywhere. Be sure to leave a space between the icon and text for proper padding.</p> <p>For performance reasons, all icons require a base class and individual icon class. To use, place the following code just about anywhere. Be sure to leave a space between the icon and text for proper padding.</p>
{% highlight html %} {% highlight html %}
<span class="glyphicon glyphicon-search"></span> <span class="glyphicon glyphicon-search"></span>

2
getting-started.html
View File

@ -545,7 +545,7 @@ bootstrap/
</tr> </tr>
<tr> <tr>
<td>Well sizes</td> <td>Well sizes</td>
<td><code>.well-small</code> <code>.well-large</code></td> <td><code>.well-sm</code> <code>.well-lg</code></td>
</tr> </tr>
<tr> <tr>
<td>Alert links</td> <td>Alert links</td>