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

Use $input-btn-border-width for both .form-control and .btn borders; fixes #18424

Browse Source 
Both widgets need to use the same border width because of input groups.
Thus:
$btn-border-width   => $input-btn-border-width
$input-border-width => $input-btn-border-width

[skip sauce]
This commit is contained in:
Chris Rebert
2015-12-07 02:07:35 -08:00
parent ed0e6be863
commit 9dacdce42c
6 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scss/_input-group.scss
+4 -4
View File
@@ -91,7 +91,7 @@
color: $input-color;
text-align: center;
background-color: $input-group-addon-bg;
border: $input-border-width solid $input-group-addon-border-color;
border: $input-btn-border-width solid $input-group-addon-border-color;
@include border-radius($border-radius);
// Sizing
@@ -160,7 +160,7 @@
> .btn {
position: relative;
+ .btn {
margin-left: (-$btn-border-width);
margin-left: (-$input-btn-border-width);
}
// Bring the "active" button to the front
@include hover-focus-active {
@@ -172,14 +172,14 @@
&:first-child {
> .btn,
> .btn-group {
margin-right: (-$btn-border-width);
margin-right: (-$input-btn-border-width);
}
}
&:last-child {
> .btn,
> .btn-group {
z-index: 2;
margin-left: (-$btn-border-width);
margin-left: (-$input-btn-border-width);
// Because specificity
@include hover-focus-active {
z-index: 3;