kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases 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
commit 1d30225e2c
1 changed files with 8 additions and 4 deletions
Show stats 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,
.btn {
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
margin-left: -1px;
.border-radius(0);
}
.active {
background-color: lighten(@green, 30);
@ -409,6 +410,10 @@ select:focus:required:invalid {
.btn {
margin-right: -1px;
}
.add-on:first-child,
.btn:first-child {
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
}
}
.input-append {
input,
@ -420,9 +425,8 @@ select:focus:required:invalid {
border-left-color: #eee;
border-right-color: #ccc;
}
.add-on,
.btn {
margin-left: -1px;
.add-on:last-child,
.btn:last-child {
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
}
}