Skip to content

B
bootstrap
Commit 5e637313 authored by Mark Otto's avatar Mark Otto
Browse files
Options

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

parents 300a9e7b 6bebecfb
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
dist/css/bootstrap.css
View file @ 5e637313
...@@ -3257,12 +3257,12 @@ button.close { ...@@ -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;
} }
......
dist/css/bootstrap.min.css
View file @ 5e637313
This source diff could not be displayed because it is too large. You can view the blob instead.
less/button-groups.less
View file @ 5e637313
...@@ -142,10 +142,10 @@ ...@@ -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);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment