rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-29 21:52:22 +01:00
Code Issues Actions Packages Releases Activity

fixes #4591 properly: remove -1px left margin on .input-append .add-on

Browse Source
This commit is contained in:
Mark Otto 2012-08-22 20:32:47 -07:00
parent 4775bc910c
commit ac4420237c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1512,7 +1512,6 @@ select:focus:required:invalid:focus {
.input-prepend .add-on, .input-prepend .add-on,
.input-append .btn, .input-append .btn,
.input-prepend .btn { .input-prepend .btn {
margin-left: -1px;
vertical-align: top; vertical-align: top;
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
@ -1545,6 +1544,11 @@ select:focus:required:invalid:focus {
border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px;
} }
.input-append .add-on,
.input-append .btn {
margin-left: -1px;
}
.input-append .add-on:last-child, .input-append .add-on:last-child,
.input-append .btn:last-child { .input-append .btn:last-child {
-webkit-border-radius: 0 3px 3px 0; -webkit-border-radius: 0 3px 3px 0;

5
less/forms.less
View File

@ -441,7 +441,6 @@ select:focus:required:invalid {
} }
.add-on, .add-on,
.btn { .btn {
margin-left: -1px;
vertical-align: top; vertical-align: top;
.border-radius(0); .border-radius(0);
} }
@ -466,6 +465,10 @@ select:focus:required:invalid {
.uneditable-input { .uneditable-input {
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius); .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
} }
.add-on,
.btn {
margin-left: -1px;
}
.add-on:last-child, .add-on:last-child,
.btn:last-child { .btn:last-child {
.border-radius(0 @inputBorderRadius @inputBorderRadius 0); .border-radius(0 @inputBorderRadius @inputBorderRadius 0);