]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
fix duplicate input prepend/append css selectors per #2026
authorMark Otto <markotto@twitter.com>
Sat, 18 Feb 2012 04:40:56 +0000 (20:40 -0800)
committerMark Otto <markotto@twitter.com>
Sat, 18 Feb 2012 04:40:56 +0000 (20:40 -0800)
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
less/forms.less

index 6a8dde1ede6be4e801869701203156ace7441386..4a303bd001aadd000214b40a461c56ea9fedfd32 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
index 105dfa401e56919f69ab8a5f383128b754d0dab3..9de79ddb71d86a14acd565e121295738ff46ff04 100644 (file)
@@ -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;
index 0a5fa2b8676b22e6e2ca5465493a019289cef561..177625204ad71ea0b5fad5a3e7369ff8853a9873 100644 (file)
@@ -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;