fix duplicate input prepend/append css selectors per #2026

b559f2b8 · Mark Otto · e7d45184 · b559f2b8 · b559f2b8 · b559f2b8
Commit b559f2b8 authored 13 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 6 additions and 6 deletions
+6 -6
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
--- 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;

--- 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;