aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-11 23:12:45 -0700
committerMark Otto <[email protected]>2012-03-11 23:12:45 -0700
commit58cb7c631dddca72f5ea87f73b3a59b4c2ec312c (patch)
tree6db7665b70954277b5adc7019da352b2fbc518f4 /docs
parent91eef351e40c7833041e68fdddba8c2b43ebc702 (diff)
downloadbootstrap-58cb7c631dddca72f5ea87f73b3a59b4c2ec312c.tar.xz
bootstrap-58cb7c631dddca72f5ea87f73b3a59b4c2ec312c.zip
simplify code for input-prepend/append in inline and search forms
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin55303 -> 55280 bytes
-rw-r--r--docs/assets/css/bootstrap.css11
2 files changed, 6 insertions, 5 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 6b84f22d0..33fb717b6 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 255b956c1..64c024c9b 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -982,6 +982,7 @@ select:focus:required:invalid:focus {
}
.input-prepend,
.input-append {
+ display: inline-block;
margin-bottom: 5px;
}
.input-prepend input,
@@ -1087,11 +1088,11 @@ select:focus:required:invalid:focus {
.form-inline .input-prepend {
display: inline-block;
}
-.form-search .input-append .add-on,
-.form-search .input-prepend .add-on,
-.form-inline .input-append .add-on,
-.form-inline .input-prepend .add-on {
- vertical-align: middle;
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+ margin-bottom: 0;
}
.form-search .radio,
.form-search .checkbox,