diff options
| author | Mark Otto <[email protected]> | 2012-01-27 19:49:56 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-27 19:49:56 -0800 |
| commit | d02c6957d44761c35121cb88af727802ce4d9e5e (patch) | |
| tree | f54e91a3377c1c9b3ec668926ecc103754e81305 /docs/base-css.html | |
| parent | a624ac1edf7484dbdf7f4176d9d4485f1878f4e5 (diff) | |
| download | bootstrap-d02c6957d44761c35121cb88af727802ce4d9e5e.tar.xz bootstrap-d02c6957d44761c35121cb88af727802ce4d9e5e.zip | |
fixing up buttons and examples of implementing icons
Diffstat (limited to 'docs/base-css.html')
| -rw-r--r-- | docs/base-css.html | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index 0c6579b1e..7552fb9b9 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1492,18 +1492,15 @@ <li>For buttons to help convey the meaning of an action</li> <li>With links to share context on a user's destination</li> </ul> - <p>Essentially, anywhere you can put an <code><i></code> tag, you can put an icon. And if you need to position the text with no icon before it (where other items have an icon; see the navigation example below) simply use <code>.icon</code> class with no other classes:</p> -<pre class="prettyprint linenums"> -<i class="icon"></i> -</pre> + <p>Essentially, anywhere you can put an <code><i></code> tag, you can put an icon.</p> </div> </div> <h3>Examples</h3> + <p>Use them in buttons, button groups for a toolbar, navigation, or prepended form inputs.</p> <div class="row"> <div class="span4"> - <p>Use them in buttons - of all types and sizes.</p> - <div class="btn-toolbar"> + <div class="btn-toolbar" style="margin-bottom: 9px"> <div class="btn-group"> <a class="btn" href="#"><i class="icon align-left"></i></a> <a class="btn" href="#"><i class="icon align-center"></i></a> @@ -1518,7 +1515,7 @@ <li><a href="#"><i class="icon trash"></i> Delete</a></li> <li><a href="#"><i class="icon ban-circle"></i> Ban</a></li> <li class="divider"></li> - <li><a href="#"><i class="icon"></i> Make Admin</a></li> + <li><a href="#"><i class="icon"></i> Make admin</a></li> </ul> </div> </div> @@ -1534,7 +1531,6 @@ </p> </div> <div class="span4"> - <p>Use them in navigation.</p> <div class="well" style="padding: 8px 0;"> <ul class="nav list"> <li class="active"><a href="#"><i class="icon white home"></i> Home</a></li> @@ -1546,9 +1542,8 @@ </div> <div class="span4"> <form> - <p>Use them with prepended forms.</p> <div class="control-group"> - <label class="control-label" for="prependedInput">Your Email Address:</label> + <label class="control-label" for="prependedInput">Email address</label> <div class="controls"> <div class="input-prepend"> <span class="add-on"><i class="icon envelope"></i></span> @@ -1556,20 +1551,6 @@ </div> </div> </div> - <div class="control-group"> - <label class="control-label" for="prependedInput">Your Location:</label> - <div class="controls"> - <div class="input-prepend"> - <span class="add-on"><i class="icon map-marker"></i></span> - <select id="select01"> - <option>Istanbul</option> - <option>London</option> - <option>New York</option> - <option>Tokyo</option> - </select> - </div> - </div> - </div> </form> </div> </div> |