mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
Code Activity

fixes #18425 by using vars for 1px borders

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
scss/_input-group.scss
+5 -5
View File
@@ -91,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-border-width solid $input-group-addon-border-color;
@include border-radius($border-radius);
// Sizing
@@ -160,7 +160,7 @@
> .btn {
position: relative;
+ .btn {
margin-left: -1px;
margin-left: (-$btn-border-width);
}
// Bring the "active" button to the front
@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 {
> .btn,
> .btn-group {
margin-right: -1px;
margin-right: (-$btn-border-width);
}
}
&:last-child {
> .btn,
> .btn-group {
z-index: 2;
margin-left: -1px;
margin-left: (-$btn-border-width);
// Because specificity
@include hover-focus-active {
z-index: 3;