Skip to content

B
bootstrap
Commit dbe47654 authored by Matt Smith's avatar Matt Smith
Browse files
Options

Nested button groups with only one child now have rounded corners (Iss.#15270)

parent ac49a099
Expand all Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 12 deletions
dist/css/bootstrap.css
View file @ dbe47654
...@@ -3577,12 +3577,12 @@ tbody.collapse.in { ...@@ -3577,12 +3577,12 @@ tbody.collapse.in {
.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
border-radius: 0; border-radius: 0;
} }
.btn-group > .btn-group:first-child > .btn:last-child, .btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child,
.btn-group > .btn-group:first-child > .dropdown-toggle { .btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }
.btn-group > .btn-group:last-child > .btn:first-child { .btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
......
dist/css/bootstrap.css.map
View file @ dbe47654
This diff was suppressed by a .gitattributes entry.
dist/css/bootstrap.min.css
View file @ dbe47654
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/assets/js/customize.min.js
View file @ dbe47654
This diff is collapsed.
docs/assets/js/raw-files.min.js
View file @ dbe47654
This diff is collapsed.
docs/dist/css/bootstrap.css
View file @ dbe47654
...@@ -3577,12 +3577,12 @@ tbody.collapse.in { ...@@ -3577,12 +3577,12 @@ tbody.collapse.in {
.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
border-radius: 0; border-radius: 0;
} }
.btn-group > .btn-group:first-child > .btn:last-child, .btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child,
.btn-group > .btn-group:first-child > .dropdown-toggle { .btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }
.btn-group > .btn-group:last-child > .btn:first-child { .btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
...@@ -6167,6 +6167,7 @@ button.close { ...@@ -6167,6 +6167,7 @@ button.close {
height: 20px; height: 20px;
margin-top: -10px; margin-top: -10px;
font-family: serif; font-family: serif;
line-height: 1;
} }
.carousel-control .icon-prev:before { .carousel-control .icon-prev:before {
content: '\2039'; content: '\2039';
......
docs/dist/css/bootstrap.css.map
View file @ dbe47654
This diff was suppressed by a .gitattributes entry.
docs/dist/css/bootstrap.min.css
View file @ dbe47654
This source diff could not be displayed because it is too large. You can view the blob instead.
less/button-groups.less
View file @ dbe47654
...@@ -71,13 +71,13 @@ ...@@ -71,13 +71,13 @@
.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
border-radius: 0; border-radius: 0;
} }
.btn-group > .btn-group:first-child { .btn-group > .btn-group:first-child:not(:last-child) {
> .btn:last-child, > .btn:last-child,
> .dropdown-toggle { > .dropdown-toggle {
.border-right-radius(0); .border-right-radius(0);
} }
} }
.btn-group > .btn-group:last-child > .btn:first-child { .btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
.border-left-radius(0); .border-left-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