aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-11 23:14:36 -0700
committerMark Otto <[email protected]>2012-03-11 23:14:36 -0700
commit5eed370856424362e23b1a5e02dd3c58c83dd30f (patch)
tree737f4c52f79675a3c1bee0bf8d33e53f6e714be6 /docs
parent58cb7c631dddca72f5ea87f73b3a59b4c2ec312c (diff)
downloadbootstrap-5eed370856424362e23b1a5e02dd3c58c83dd30f.tar.xz
bootstrap-5eed370856424362e23b1a5e02dd3c58c83dd30f.zip
fix more spacing issues with input append/prepend
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin55280 -> 55304 bytes
-rw-r--r--docs/assets/css/bootstrap.css15
2 files changed, 8 insertions, 7 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 33fb717b6..17f272fc5 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 64c024c9b..433a345ab 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -982,7 +982,6 @@ select:focus:required:invalid:focus {
}
.input-prepend,
.input-append {
- display: inline-block;
margin-bottom: 5px;
}
.input-prepend input,
@@ -1071,7 +1070,13 @@ select:focus:required:invalid:focus {
.form-horizontal .help-inline,
.form-search .uneditable-input,
.form-inline .uneditable-input,
-.form-horizontal .uneditable-input {
+.form-horizontal .uneditable-input,
+.form-search .input-prepend,
+.form-inline .input-prepend,
+.form-horizontal .input-prepend,
+.form-search .input-append,
+.form-inline .input-append,
+.form-horizontal .input-append {
display: inline-block;
margin-bottom: 0;
}
@@ -1081,11 +1086,7 @@ select:focus:required:invalid:focus {
display: none;
}
.form-search label,
-.form-inline label,
-.form-search .input-append,
-.form-inline .input-append,
-.form-search .input-prepend,
-.form-inline .input-prepend {
+.form-inline label {
display: inline-block;
}
.form-search .input-append,