2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03: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
+3 -3
View File
@@ -138,7 +138,7 @@
background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAMAAACzvE1FAAAADFBMVEUzMzMzMzMzMzMzMzMKAG/3AAAAA3RSTlMAf4C/aSLHAAAAPElEQVR42q3NMQ4AIAgEQTn//2cLdRKppSGzBYwzVXvznNWs8C58CiussPJj8h6NwgorrKRdTvuV9v16Afn0AYFOB7aYAAAAAElFTkSuQmCC) no-repeat right .75rem center;
background-image: none \9;
background-size: 8px 10px;
border: $input-border-width solid $input-border-color;
border: $input-btn-border-width solid $input-border-color;
// Use vendor prefixes as `appearance` isn't part of the CSS spec.
-moz-appearance: none;
-webkit-appearance: none;
@@ -195,7 +195,7 @@
color: #555;
user-select: none;
background-color: #fff;
border: $input-border-width solid #ddd;
border: $input-btn-border-width solid #ddd;
border-radius: .25rem;
@include box-shadow(inset 0 .2rem .4rem rgba(0,0,0,.05));
}
@@ -215,7 +215,7 @@
color: #555;
content: "Browse";
background-color: #eee;
border: $input-border-width solid #ddd;
border: $input-btn-border-width solid #ddd;
border-radius: 0 .25rem .25rem 0;
}