mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-13 17:14:04 +02:00
Code Issues Releases Wiki Activity

Merge branch 'jasny-patch-2' into 2.0.3-wip

Browse Source 
Conflicts:
	less/forms.less
This commit is contained in:
Mark Otto
2012-04-07 16:43:48 -07:00
parent 0a71f171bc fedce0cec7
commit 1d30225e2c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
less/forms.less
View File

@@ -397,7 +397,8 @@ select:focus:required:invalid {
} }
.add-on, .add-on,
.btn { .btn {
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius); margin-left: -1px;
.border-radius(0);
} }
.active { .active {
background-color: lighten(@green, 30); background-color: lighten(@green, 30);
@@ -409,6 +410,10 @@ select:focus:required:invalid {
.btn { .btn {
margin-right: -1px; margin-right: -1px;
} }
.add-on:first-child,
.btn:first-child {
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
}
} }
.input-append { .input-append {
input, input,
@@ -420,9 +425,8 @@ select:focus:required:invalid {
border-left-color: #eee; border-left-color: #eee;
border-right-color: #ccc; border-right-color: #ccc;
} }
.add-on, .add-on:last-child,
.btn { .btn:last-child {
margin-left: -1px;
.border-radius(0 @inputBorderRadius @inputBorderRadius 0); .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
} }
} }