Skip to content

B
bootstrap
Commit b559f2b8 authored by Mark Otto's avatar Mark Otto
Browse files
Options

fix duplicate input prepend/append css selectors per #2026

parent e7d45184
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
docs/assets/css/bootstrap.css
View file @ b559f2b8
...@@ -989,14 +989,14 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec ...@@ -989,14 +989,14 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
display: inline-block; display: inline-block;
} }
.form-search .input-append .add-on, .form-search .input-append .add-on,
.form-inline .input-prepend .add-on, .form-search .input-prepend .add-on,
.form-search .input-append .add-on, .form-inline .input-append .add-on,
.form-inline .input-prepend .add-on { .form-inline .input-prepend .add-on {
vertical-align: middle; vertical-align: middle;
} }
.form-search .radio, .form-search .radio,
.form-inline .radio,
.form-search .checkbox, .form-search .checkbox,
.form-inline .radio,
.form-inline .checkbox { .form-inline .checkbox {
margin-bottom: 0; margin-bottom: 0;
vertical-align: middle; vertical-align: middle;
......
less/forms.less
View file @ b559f2b8
...@@ -470,15 +470,15 @@ select:focus:required:invalid { ...@@ -470,15 +470,15 @@ select:focus:required:invalid {
} }
// Make the prepend and append add-on vertical-align: middle; // Make the prepend and append add-on vertical-align: middle;
.form-search .input-append .add-on, .form-search .input-append .add-on,
.form-inline .input-prepend .add-on, .form-search .input-prepend .add-on,
.form-search .input-append .add-on, .form-inline .input-append .add-on,
.form-inline .input-prepend .add-on { .form-inline .input-prepend .add-on {
vertical-align: middle; vertical-align: middle;
} }
// Inline checkbox/radio labels // Inline checkbox/radio labels
.form-search .radio, .form-search .radio,
.form-inline .radio,
.form-search .checkbox, .form-search .checkbox,
.form-inline .radio,
.form-inline .checkbox { .form-inline .checkbox {
margin-bottom: 0; margin-bottom: 0;
vertical-align: middle; vertical-align: middle;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment