sharpetronics/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-11-04 00:03:15 -05:00
Code Issues Projects Releases Wiki Activity

Fix handling of btn-group placed inside input-group-btn (used for mixing dropdowns with normal buttons)

Browse Source
This commit is contained in:
Sebastian Podjasek 2013-12-16 22:47:09 +01:00
parent 94635eb972
commit ae640d4f1c
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dist/css/bootstrap.css vendored
View File

@ -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 {

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

18
less/input-groups.less
View File

@ -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 {
&:first-child {
> .btn,
> .btn-group {
margin-right: -1px;
}
&:last-child > .btn {
}
&:last-child {
> .btn,
> .btn-group {
margin-left: -1px;
}
}
}