diff options
Diffstat (limited to 'assets/stylesheets/bootstrap/_input-group.scss')
| -rw-r--r-- | assets/stylesheets/bootstrap/_input-group.scss | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/assets/stylesheets/bootstrap/_input-group.scss b/assets/stylesheets/bootstrap/_input-group.scss index 3b4ef63..e6681eb 100644 --- a/assets/stylesheets/bootstrap/_input-group.scss +++ b/assets/stylesheets/bootstrap/_input-group.scss @@ -19,6 +19,10 @@ // proper border colors. position: relative; z-index: 2; + // Bring the "active" form control to the front + @include hover-focus-active { + z-index: 3; + } @if $enable-flex { flex: 1; } @else { @@ -87,7 +91,7 @@ color: $input-color; text-align: center; background-color: $input-group-addon-bg; - border: 1px solid $input-group-addon-border-color; + border: $input-btn-border-width solid $input-group-addon-border-color; @include border-radius($border-radius); // Sizing @@ -156,26 +160,30 @@ > .btn { position: relative; + .btn { - margin-left: -1px; + margin-left: (-$input-btn-border-width); } // Bring the "active" button to the front @include hover-focus-active { - z-index: 2; + z-index: 3; } } - // Negative margin to only have a 1px border between the two + // Negative margin to only have a single, shared border between the two &:first-child { > .btn, > .btn-group { - margin-right: -1px; + margin-right: (-$input-btn-border-width); } } &:last-child { > .btn, > .btn-group { z-index: 2; - margin-left: -1px; + margin-left: (-$input-btn-border-width); + // Because specificity + @include hover-focus-active { + z-index: 3; + } } } } |