1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-19 03:41:19 +02:00

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

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

View File

@@ -224,7 +224,6 @@ $table-border-color: $gray-lighter !default;
$btn-padding-x: 1rem !default;
$btn-padding-y: .375rem !default;
$btn-font-weight: normal !default;
$btn-border-width: $border-width !default;
$btn-primary-color: #fff !default;
$btn-primary-bg: $brand-primary !default;
@@ -274,7 +273,7 @@ $input-bg-disabled: $gray-lighter !default;
$input-color: $gray !default;
$input-border-color: #ccc !default;
$input-border-width: $border-width !default;
$input-btn-border-width: $border-width !default; // For form controls and buttons
$input-box-shadow: inset 0 1px 1px rgba(0,0,0,.075) !default;
$input-border-radius: $border-radius !default;