diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index b4d58a8ace..b10376a631 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9de317af5a..1ded1be23d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -940,6 +940,9 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec display: inline-block; margin-bottom: 0; } +.form-search .hide, .form-inline .hide, .form-horizontal .hide { + display: none; +} .form-search label, .form-inline label, .form-search .input-append, diff --git a/docs/base-css.html b/docs/base-css.html index 3c9e9a187d..48f0424178 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -886,7 +886,7 @@ For example, <code>section</code> should be wrapped as inline. <p>Inputs are block level to start. For <code>.form-inline</code> and <code>.form-horizontal</code>, we use inline-block.</p> </div> <div class="span9"> - <form class="well form-search"> + <form class="well form-inline"> <input type="text" class="input-small" placeholder="Email"> <input type="password" class="input-small" placeholder="Password"> <button type="submit" class="btn">Go</button> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 5c0444d1a8..fd9a82f502 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -810,7 +810,7 @@ <p>{{_i}}Inputs are block level to start. For <code>.form-inline</code> and <code>.form-horizontal</code>, we use inline-block.{{/i}}</p> </div> <div class="span9"> - <form class="well form-search"> + <form class="well form-inline"> <input type="text" class="input-small" placeholder="{{_i}}Email{{/i}}"> <input type="password" class="input-small" placeholder="{{_i}}Password{{/i}}"> <button type="submit" class="btn">{{_i}}Go{{/i}}</button> diff --git a/less/forms.less b/less/forms.less index ccf3c67fae..31442fa364 100644 --- a/less/forms.less +++ b/less/forms.less @@ -462,6 +462,10 @@ select:focus:required:invalid { display: inline-block; margin-bottom: 0; } + // Re-hide hidden elements due to specifity + .hide { + display: none; + } } .form-search label, .form-inline label,