0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-21 18:54:30 +01:00

Alternative fix to double border

This commit is contained in:
Vicary Archangel 2015-12-12 02:22:48 +08:00
parent c0f931d050
commit 54fdb45fa5

View File

@ -128,6 +128,9 @@
.input-group-btn:not(:first-child) > .btn-group:not(:last-child) > .btn { .input-group-btn:not(:first-child) > .btn-group:not(:last-child) > .btn {
@include border-right-radius(0); @include border-right-radius(0);
} }
.input-group-addon:not(:last-child) {
border-right: 0;
}
.input-group .form-control:not(:first-child), .input-group .form-control:not(:first-child),
.input-group-addon:not(:first-child), .input-group-addon:not(:first-child),
.input-group-btn:not(:first-child) > .btn, .input-group-btn:not(:first-child) > .btn,
@ -137,12 +140,10 @@
.input-group-btn:not(:last-child) > .btn-group:not(:first-child) > .btn { .input-group-btn:not(:last-child) > .btn-group:not(:first-child) > .btn {
@include border-left-radius(0); @include border-left-radius(0);
} }
.input-group .form-control:not(:first-child), .form-control + .input-group-addon:not(:first-child) {
.input-group-addon:not(:first-child) {
border-left: 0; border-left: 0;
} }
// //
// Button input groups // Button input groups
// //
@ -168,11 +169,17 @@
} }
// Negative margin to only have a single, shared border between the two // Negative margin to only have a single, shared border between the two
&:not(:last-child) {
> .btn,
> .btn-group {
margin-right: (-$input-btn-border-width);
}
}
&:not(:first-child) { &:not(:first-child) {
> .btn, > .btn,
> .btn-group { > .btn-group {
z-index: 2; z-index: 2;
margin-left: (-$input-btn-border-width) * 2; margin-left: (-$input-btn-border-width);
// Because specificity // Because specificity
@include hover-focus-active { @include hover-focus-active {
z-index: 3; z-index: 3;