rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00
Code Issues Actions Packages Releases Activity

fix more spacing issues with input append/prepend

Browse Source
This commit is contained in:
Mark Otto 2012-03-11 23:14:36 -07:00
parent 58cb7c631d
commit 5eed370856
3 changed files with 12 additions and 14 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.

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

@ -982,7 +982,6 @@ select:focus:required:invalid:focus {
}
.input-prepend,
.input-append {
display: inline-block;
margin-bottom: 5px;
}
.input-prepend input,
@ -1071,7 +1070,13 @@ select:focus:required:invalid:focus {
.form-horizontal .help-inline,
.form-search .uneditable-input,
.form-inline .uneditable-input,
.form-horizontal .uneditable-input {
.form-horizontal .uneditable-input,
.form-search .input-prepend,
.form-inline .input-prepend,
.form-horizontal .input-prepend,
.form-search .input-append,
.form-inline .input-append,
.form-horizontal .input-append {
display: inline-block;
margin-bottom: 0;
}
@ -1081,11 +1086,7 @@ select:focus:required:invalid:focus {
display: none;
}
.form-search label,
.form-inline label,
.form-search .input-append,
.form-inline .input-append,
.form-search .input-prepend,
.form-inline .input-prepend {
.form-inline label {
display: inline-block;
}
.form-search .input-append,

11
less/forms.less
View File

@ -361,7 +361,6 @@ select:focus:required:invalid {
// Allow us to put symbols and text within the input field for a cleaner look
.input-prepend,
.input-append {
display: inline-block;
margin-bottom: 5px;
input,
select,
@ -440,7 +439,9 @@ select:focus:required:invalid {
textarea,
select,
.help-inline,
.uneditable-input {
.uneditable-input,
.input-prepend,
.input-append {
display: inline-block;
margin-bottom: 0;
}
@ -450,11 +451,7 @@ select:focus:required:invalid {
}
}
.form-search label,
.form-inline label,
.form-search .input-append,
.form-inline .input-append,
.form-search .input-prepend,
.form-inline .input-prepend {
.form-inline label {
display: inline-block;
}
// Remove margin for input-prepend/-append