mirror of https://github.com/twbs/bootstrap.git
				
				
				
			Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
This commit is contained in:
		
						commit
						b5ac1b065e
					
				|  | @ -2,7 +2,7 @@ | |||
|   <a href="#glyphicons">Glyphicons</a> | ||||
|   <ul class="nav"> | ||||
|     <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> | ||||
|   </ul> | ||||
| </li> | ||||
|  |  | |||
|  | @ -244,7 +244,7 @@ base_url: "../" | |||
|     </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> | ||||
| {% highlight html %} | ||||
| <span class="glyphicon glyphicon-search"></span> | ||||
|  |  | |||
|  | @ -545,7 +545,7 @@ bootstrap/ | |||
|         </tr> | ||||
|         <tr> | ||||
|           <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> | ||||
|           <td>Alert links</td> | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue