diff options
| author | Mark Otto <[email protected]> | 2013-08-18 11:08:29 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 11:08:29 -0700 |
| commit | b5ac1b065ebd8ac5d67a11edcc0428abfef6a4a5 (patch) | |
| tree | 6d66494eec03baa2c1de1fa445077f5595ea314e | |
| parent | ef4590dfb461036c915d8fbc5b6fbf3ad7ba9c86 (diff) | |
| parent | 0cbffb3bcbc60582e90711e0b5ac36e2df51f7d8 (diff) | |
| download | bootstrap-b5ac1b065ebd8ac5d67a11edcc0428abfef6a4a5.tar.xz bootstrap-b5ac1b065ebd8ac5d67a11edcc0428abfef6a4a5.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
| -rw-r--r-- | _includes/nav-components.html | 2 | ||||
| -rw-r--r-- | components.html | 2 | ||||
| -rw-r--r-- | getting-started.html | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/_includes/nav-components.html b/_includes/nav-components.html index b251cc332..a1105cdda 100644 --- a/_includes/nav-components.html +++ b/_includes/nav-components.html @@ -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> diff --git a/components.html b/components.html index 52a85cf03..6b3ca7053 100644 --- a/components.html +++ b/components.html @@ -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> diff --git a/getting-started.html b/getting-started.html index 30e55299e..83c2583ce 100644 --- a/getting-started.html +++ b/getting-started.html @@ -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> |