root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity

fixes #18425 by using vars for 1px borders

This commit is contained in:
Mark Otto 2015-12-06 16:45:40 -08:00
parent 5a2318b68c
commit 49674a8eba
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scss/_button-group.scss
View File

@ -27,7 +27,7 @@
.btn + .btn-group, .btn + .btn-group,
.btn-group + .btn, .btn-group + .btn,
.btn-group + .btn-group { .btn-group + .btn-group {
margin-left: -$border-width; margin-left: -$btn-border-width;
} }
} }
@ -167,7 +167,7 @@
> .btn + .btn-group, > .btn + .btn-group,
> .btn-group + .btn, > .btn-group + .btn,
> .btn-group + .btn-group { > .btn-group + .btn-group {
margin-top: -$border-width; margin-top: -$btn-border-width;
margin-left: 0; margin-left: 0;
} }
} }

2
scss/_buttons.scss
View File

@ -10,7 +10,7 @@
vertical-align: middle; vertical-align: middle;
cursor: pointer; cursor: pointer;
user-select: none; user-select: none;
border: $border-width solid transparent; border: $btn-border-width solid transparent;
@include button-size($btn-padding-y, $btn-padding-x, $font-size-base, $line-height, $btn-border-radius); @include button-size($btn-padding-y, $btn-padding-x, $font-size-base, $line-height, $btn-border-radius);
@include transition(all .2s ease-in-out); @include transition(all .2s ease-in-out);

10
scss/_input-group.scss
View File

@ -91,7 +91,7 @@
color: $input-color; color: $input-color;
text-align: center; text-align: center;
background-color: $input-group-addon-bg; background-color: $input-group-addon-bg;
border: 1px solid $input-group-addon-border-color; border: $input-border-width solid $input-group-addon-border-color;
@include border-radius($border-radius); @include border-radius($border-radius);
// Sizing // Sizing
@ -160,7 +160,7 @@
> .btn { > .btn {
position: relative; position: relative;
+ .btn { + .btn {
margin-left: -1px; margin-left: (-$btn-border-width);
} }
// Bring the "active" button to the front // Bring the "active" button to the front
@include hover-focus-active { @include hover-focus-active {
@ -168,18 +168,18 @@
} }
} }
// 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 { &:first-child {
> .btn, > .btn,
> .btn-group { > .btn-group {
margin-right: -1px; margin-right: (-$btn-border-width);
} }
} }
&:last-child { &:last-child {
> .btn, > .btn,
> .btn-group { > .btn-group {
z-index: 2; z-index: 2;
margin-left: -1px; margin-left: (-$btn-border-width);
// Because specificity // Because specificity
@include hover-focus-active { @include hover-focus-active {
z-index: 3; z-index: 3;

1
scss/_variables.scss
View File

@ -224,6 +224,7 @@ $table-border-color: $gray-lighter !default;
$btn-padding-x: 1rem !default; $btn-padding-x: 1rem !default;
$btn-padding-y: .375rem !default; $btn-padding-y: .375rem !default;
$btn-font-weight: normal !default; $btn-font-weight: normal !default;
$btn-border-width: $border-width !default;
$btn-primary-color: #fff !default; $btn-primary-color: #fff !default;
$btn-primary-bg: $brand-primary !default; $btn-primary-bg: $brand-primary !default;