aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-04 18:26:04 -0800
committerMark Otto <[email protected]>2012-02-04 18:26:04 -0800
commitac98cee6092738eb431ebd4c944886358dab721f (patch)
treef018c506f6bacd340e79f77faa4e707726a63826 /docs
parent9ab843b936a6bc9889f0f55a83f13cb25a3990bd (diff)
downloadbootstrap-ac98cee6092738eb431ebd4c944886358dab721f.tar.xz
bootstrap-ac98cee6092738eb431ebd4c944886358dab721f.zip
allow alternate form layouts to hide inputs with .hide on them
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin52356 -> 52387 bytes
-rw-r--r--docs/assets/css/bootstrap.css3
-rw-r--r--docs/base-css.html2
-rw-r--r--docs/templates/pages/base-css.mustache2
4 files changed, 5 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index b4d58a8ac..b10376a63 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 9de317af5..1ded1be23 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 3c9e9a187..48f042417 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -886,7 +886,7 @@ For example, &lt;code&gt;section&lt;/code&gt; 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 5c0444d1a..fd9a82f50 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>