diff options
| author | Mark Otto <[email protected]> | 2012-11-04 19:59:07 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-04 19:59:07 -0800 |
| commit | ee93541421e41f3a9589f9c945ef4a6614f48b4b (patch) | |
| tree | af6a1171e971cf054b6d5649d3378409abff9fbd /docs/base-css.html | |
| parent | 1af0021014a1c50ac02facd23a36dfc8f74cd143 (diff) | |
| parent | 62c78e46f8d027d0797c66bef5ce8cdb8d667ace (diff) | |
| download | bootstrap-ee93541421e41f3a9589f9c945ef4a6614f48b4b.tar.xz bootstrap-ee93541421e41f3a9589f9c945ef4a6614f48b4b.zip | |
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
less/buttons.less
less/forms.less
Diffstat (limited to 'docs/base-css.html')
| -rw-r--r-- | docs/base-css.html | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index aceb665c3..ac99d43b2 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1323,6 +1323,54 @@ For example, <code><section></code> should be wrapped as inlin </div> </pre> + <h4>Segmented dropdown groups</h4> + <form class="bs-docs-example"> + <div class="input-prepend"> + <div class="btn-group"> + <button class="btn" tabindex="-1">Action</button> + <button class="btn dropdown-toggle" data-toggle="dropdown" tabindex="-1"> + <span class="caret"></span> + </button> + <ul class="dropdown-menu"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li><a href="#">Separated link</a></li> + </ul> + </div> + <input type="text"> + </div> + <div class="input-append"> + <input type="text"> + <div class="btn-group"> + <button class="btn" tabindex="-1">Action</button> + <button class="btn dropdown-toggle" data-toggle="dropdown" tabindex="-1"> + <span class="caret"></span> + </button> + <ul class="dropdown-menu"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li><a href="#">Separated link</a></li> + </ul> + </div> + </div> + </form> +<pre class="prettyprint linenums"> +<form> + <div class="input-prepend"> + <div class="btn-group">...</div> + <input type="text"> + </div> + <div class="input-append"> + <input type="text"> + <div class="btn-group">...</div> + </div> +</form> +</pre> + <h4>Search form</h4> <form class="bs-docs-example form-search"> <div class="input-append"> @@ -1513,6 +1561,15 @@ For example, <code><section></code> should be wrapped as inlin <input class="input-xlarge" id="focusedInput" type="text" value="This is focused..."> </pre> + <h3>Invalid inputs</h3> + <p>Style inputs via default browser functionality with <code>:invalid</code>. Specify a <code>type</code> and add the <code>required</code> attribute.</p> + <form class="bs-docs-example form-inline"> + <input class="span3" type="email" placeholder="[email protected]" required> + </form> +<pre class="prettyprint linenums"> +<input class="span3" type="email" required> +</pre> + <h3>Disabled inputs</h3> <p>Add the <code>disabled</code> attribute on an input to prevent user input and trigger a slightly different look.</p> <form class="bs-docs-example form-inline"> |