aboutsummaryrefslogtreecommitdiff
path: root/docs/assets
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-17 20:40:56 -0800
committerMark Otto <[email protected]>2012-02-17 20:40:56 -0800
commitb559f2b8d05f4f5425e5ba6ec32e00fa99dd3b25 (patch)
tree85609b2dfce1f15f16fe31dfd809f3418f733a0b /docs/assets
parente7d45184f1331bf4e82f7391d9607c4078b94278 (diff)
downloadbootstrap-b559f2b8d05f4f5425e5ba6ec32e00fa99dd3b25.tar.xz
bootstrap-b559f2b8d05f4f5425e5ba6ec32e00fa99dd3b25.zip
fix duplicate input prepend/append css selectors per #2026
Diffstat (limited to 'docs/assets')
-rw-r--r--docs/assets/bootstrap.zipbin53353 -> 53359 bytes
-rw-r--r--docs/assets/css/bootstrap.css6
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 6a8dde1ed..4a303bd00 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 105dfa401..9de79ddb7 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -989,14 +989,14 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
display: inline-block;
}
.form-search .input-append .add-on,
-.form-inline .input-prepend .add-on,
-.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 .radio,
-.form-inline .radio,
.form-search .checkbox,
+.form-inline .radio,
.form-inline .checkbox {
margin-bottom: 0;
vertical-align: middle;