From: Mark Otto <markotto@twitter.com>
Date: Sat, 18 Feb 2012 04:40:56 +0000 (-0800)
Subject: fix duplicate input prepend/append css selectors per #2026
X-Git-Tag: v2.0.2~157
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b559f2b8d05f4f5425e5ba6ec32e00fa99dd3b25;p=thirdparty%2Fbootstrap.git

fix duplicate input prepend/append css selectors per #2026
---

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 6a8dde1ede..4a303bd001 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 105dfa401e..9de79ddb71 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;
diff --git a/less/forms.less b/less/forms.less
index 0a5fa2b867..177625204a 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -470,15 +470,15 @@ select:focus:required:invalid {
 }
 // Make the prepend and append add-on vertical-align: middle;
 .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;
 }
 // Inline checkbox/radio labels
 .form-search .radio,
-.form-inline .radio,
 .form-search .checkbox,
+.form-inline .radio,
 .form-inline .checkbox {
   margin-bottom: 0;
   vertical-align: middle;