Skip to content

B
bootstrap
Commit 91fdd891 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge pull request #11910 from InWayOpenSource/btn-group-inside-input-group-btn 

Fix handling of .btn-group placed inside .input-group-btn
parents 36e3311b ae640d4f
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 11 deletions
dist/css/bootstrap.css
View file @ 91fdd891
......@@ -3361,8 +3361,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
.input-group .form-control:first-child,
.input-group-addon:first-child,
.input-group-btn:first-child > .btn,
.input-group-btn:first-child > .btn-group > .btn,
.input-group-btn:first-child > .dropdown-toggle,
.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
......@@ -3372,8 +3374,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
.input-group .form-control:last-child,
.input-group-addon:last-child,
.input-group-btn:last-child > .btn,
.input-group-btn:last-child > .btn-group > .btn,
.input-group-btn:last-child > .dropdown-toggle,
.input-group-btn:first-child > .btn:not(:first-child) {
.input-group-btn:first-child > .btn:not(:first-child),
.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
......@@ -3396,10 +3400,12 @@ textarea.input-group-sm > .input-group-btn > .btn {
.input-group-btn > .btn:active {
z-index: 2;
}
.input-group-btn:first-child > .btn {
.input-group-btn:first-child > .btn,
.input-group-btn:first-child > .btn-group {
margin-right: -1px;
}
.input-group-btn:last-child > .btn {
.input-group-btn:last-child > .btn,
.input-group-btn:last-child > .btn-group {
margin-left: -1px;
}
.nav {
......
dist/css/bootstrap.min.css
View file @ 91fdd891
This source diff could not be displayed because it is too large. You can view the blob instead.
less/input-groups.less
View file @ 91fdd891
......@@ -95,8 +95,10 @@
.input-group .form-control:first-child,
.input-group-addon:first-child,
.input-group-btn:first-child > .btn,
.input-group-btn:first-child > .btn-group > .btn,
.input-group-btn:first-child > .dropdown-toggle,
.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
.border-right-radius(0);
}
.input-group-addon:first-child {
......@@ -105,8 +107,10 @@
.input-group .form-control:last-child,
.input-group-addon:last-child,
.input-group-btn:last-child > .btn,
.input-group-btn:last-child > .btn-group > .btn,
.input-group-btn:last-child > .dropdown-toggle,
.input-group-btn:first-child > .btn:not(:first-child) {
.input-group-btn:first-child > .btn:not(:first-child),
.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
.border-left-radius(0);
}
.input-group-addon:last-child {
......@@ -138,10 +142,16 @@
}
// Negative margin to only have a 1px border between the two
&:first-child > .btn {
margin-right: -1px;
&:first-child {
> .btn,
> .btn-group {
margin-right: -1px;
}
}
&:last-child > .btn {
margin-left: -1px;
&:last-child {
> .btn,
> .btn-group {
margin-left: -1px;
}
}
}
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