0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00

Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

This commit is contained in:
Mark Otto 2013-08-04 22:25:58 -07:00
commit 5e637313b7
3 changed files with 5 additions and 5 deletions

View File

@ -3257,12 +3257,12 @@ button.close {
border-radius: 0; border-radius: 0;
} }
.btn-group-vertical .btn:first-child { .btn-group-vertical .btn:first-child:not(:last-child) {
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.btn-group-vertical .btn:last-child { .btn-group-vertical .btn:last-child:not(:first-child) {
border-top-right-radius: 0; border-top-right-radius: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
} }

File diff suppressed because one or more lines are too long

View File

@ -142,10 +142,10 @@
&:not(:first-child):not(:last-child) { &:not(:first-child):not(:last-child) {
border-radius: 0; border-radius: 0;
} }
&:first-child { &:first-child:not(:last-child) {
.border-bottom-radius(0); .border-bottom-radius(0);
} }
&:last-child { &:last-child:not(:first-child) {
.border-top-radius(0); .border-top-radius(0);
} }
} }