diff options
| author | Jacob Thornton <[email protected]> | 2012-02-13 18:42:57 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-02-13 18:42:57 -0800 |
| commit | a8c478e05189d195d4b921c5d0eb6c601ea35711 (patch) | |
| tree | 592350f61d1a4ba91ed587ea8615b5a850ea13d7 /docs/base-css.html | |
| parent | 6e77c9d1233c1621deeaa2dd00e6eca3fd618610 (diff) | |
| parent | 64ea59234f30f51ab5497830d1825c7e043a575e (diff) | |
| download | bootstrap-a8c478e05189d195d4b921c5d0eb6c601ea35711.tar.xz bootstrap-a8c478e05189d195d4b921c5d0eb6c601ea35711.zip | |
Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/base-css.html')
| -rw-r--r-- | docs/base-css.html | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index 845f0460e..d67d1bd55 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -15,7 +15,7 @@ <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements --> <!--[if lt IE 9]> - <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> + <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <![endif]--> <!-- Le fav and touch icons --> @@ -1121,7 +1121,7 @@ For example, <code>section</code> should be wrapped as inline. <fieldset> <legend>Extending form controls</legend> <div class="control-group"> - <label class="control-label">Form sizes</label> + <label class="control-label">Form grid sizes</label> <div class="controls docs-input-sizes"> <input class="span1" type="text" placeholder=".span1"> <input class="span2" type="text" placeholder=".span2"> @@ -1151,6 +1151,15 @@ For example, <code>section</code> should be wrapped as inline. </div> </div> <div class="control-group"> + <label class="control-label">Alternate sizes</label> + <div class="controls docs-input-sizes"> + <input class="input-mini" type="text" placeholder=".input-mini"> + <input class="input-small" type="text" placeholder=".input-small"> + <input class="input-medium" type="text" placeholder=".input-medium"> + <p class="help-block">You may also use static classes that don't map to the grid, adapt to the responsive CSS styles, or account for varying types of controls (e.g., <code>input</code> vs. <code>select</code>).</p> + </div> + </div> + <div class="control-group"> <label class="control-label" for="prependedInput">Prepended text</label> <div class="controls"> <div class="input-prepend"> @@ -1286,6 +1295,11 @@ For example, <code>section</code> should be wrapped as inline. <td><code>.btn-danger</code></td> <td>Indicates a dangerous or potentially negative action</td> </tr> + <tr> + <td><a class="btn btn-inverse" href="#">Inverse</a></td> + <td><code>.btn-inverse</code></td> + <td>Alternate dark gray button, not tied to a semantic action or use</td> + </tr> </tbody> </table> |