root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity

simplify code for input-prepend/append in inline and search forms

This commit is contained in:
Mark Otto 2012-03-11 23:12:45 -07:00
parent 91eef351e4
commit 58cb7c631d
3 changed files with 13 additions and 11 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.

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

@ -982,6 +982,7 @@ select:focus:required:invalid:focus {
} }
.input-prepend, .input-prepend,
.input-append { .input-append {
display: inline-block;
margin-bottom: 5px; margin-bottom: 5px;
} }
.input-prepend input, .input-prepend input,
@ -1087,11 +1088,11 @@ select:focus:required:invalid:focus {
.form-inline .input-prepend { .form-inline .input-prepend {
display: inline-block; display: inline-block;
} }
.form-search .input-append .add-on, .form-search .input-append,
.form-search .input-prepend .add-on, .form-inline .input-append,
.form-inline .input-append .add-on, .form-search .input-prepend,
.form-inline .input-prepend .add-on { .form-inline .input-prepend {
vertical-align: middle; margin-bottom: 0;
} }
.form-search .radio, .form-search .radio,
.form-search .checkbox, .form-search .checkbox,

13
less/forms.less
View File

@ -361,6 +361,7 @@ select:focus:required:invalid {
// Allow us to put symbols and text within the input field for a cleaner look // Allow us to put symbols and text within the input field for a cleaner look
.input-prepend, .input-prepend,
.input-append { .input-append {
display: inline-block;
margin-bottom: 5px; margin-bottom: 5px;
input, input,
select, select,
@ -456,12 +457,12 @@ select:focus:required:invalid {
.form-inline .input-prepend { .form-inline .input-prepend {
display: inline-block; display: inline-block;
} }
// Make the prepend and append add-on vertical-align: middle; // Remove margin for input-prepend/-append
.form-search .input-append .add-on, .form-search .input-append,
.form-search .input-prepend .add-on, .form-inline .input-append,
.form-inline .input-append .add-on, .form-search .input-prepend,
.form-inline .input-prepend .add-on { .form-inline .input-prepend {
vertical-align: middle; margin-bottom: 0;
} }
// Inline checkbox/radio labels (remove padding on left) // Inline checkbox/radio labels (remove padding on left)
.form-search .radio, .form-search .radio,