kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

fix duplicate input prepend/append css selectors per #2026

This commit is contained in:
Mark Otto 2012-02-17 20:40:56 -08:00
parent e7d45184f1
commit b559f2b8d0
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

6
docs/assets/css/bootstrap.css vendored
View File

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

6
less/forms.less
View File

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