diff options
| author | Chris Rebert <[email protected]> | 2014-07-27 17:06:48 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-07-27 17:06:48 -0700 |
| commit | a64f2008dafe2c1ba84c6c3195834fc25a4e84d6 (patch) | |
| tree | b5c1a6b7b7b517acd2794bd0c95809f39d17eeb1 /docs | |
| parent | d6d9bb5bc857b2fd2cb21f89861d9f84904c1997 (diff) | |
| parent | 43fe197da7556b77c421699aca61eddf93a59d7c (diff) | |
| download | bootstrap-a64f2008dafe2c1ba84c6c3195834fc25a4e84d6.tar.xz bootstrap-a64f2008dafe2c1ba84c6c3195834fc25a4e84d6.zip | |
Merge pull request #14235 from twbs/doc-14221
Update docs & add example for #14221
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/_includes/css/forms.html | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html index 483c0e588..5bb99f00c 100644 --- a/docs/_includes/css/forms.html +++ b/docs/_includes/css/forms.html @@ -375,7 +375,7 @@ <h2 id="forms-controls-static">Static control</h2> - <p>When you need to place plain text next to a form label within a horizontal form, use the <code>.form-control-static</code> class on a <code><p></code>.</p> + <p>When you need to place plain text next to a form label within a form, use the <code>.form-control-static</code> class on a <code><p></code>.</p> <div class="bs-example"> <form class="form-horizontal" role="form"> <div class="form-group"> @@ -408,6 +408,32 @@ </div> </form> {% endhighlight %} + <div class="bs-example"> + <form class="form-inline" role="form"> + <div class="form-group"> + <label class="sr-only">Email</label> + <p class="form-control-static">[email protected]</p> + </div> + <div class="form-group"> + <label for="inputPassword2" class="sr-only">Password</label> + <input type="password" class="form-control" id="inputPassword2" placeholder="Password"> + </div> + <button type="submit" class="btn btn-default">Confirm identity</button> + </form> + </div> +{% highlight html %} +<form class="form-inline" role="form"> + <div class="form-group"> + <label class="sr-only">Email</label> + <p class="form-control-static">[email protected]</p> + </div> + <div class="form-group"> + <label for="inputPassword2" class="sr-only">Password</label> + <input type="password" class="form-control" id="inputPassword2" placeholder="Password"> + </div> + <button type="submit" class="btn btn-default">Confirm identity</button> +</form> +{% endhighlight %} <h2 id="forms-control-focus">Input focus</h2> <p>We remove the default <code>outline</code> styles on some form controls and apply a <code>box-shadow</code> in its place for <code>:focus</code>.</p> |