diff options
| author | Alexandr Kondrashov <[email protected]> | 2015-12-08 02:18:32 +0300 |
|---|---|---|
| committer | Alexandr Kondrashov <[email protected]> | 2015-12-08 02:18:32 +0300 |
| commit | 5f316e6dc34f57bfbd0ebf922fe5a01cc6bb38c4 (patch) | |
| tree | 2951782d8d0aadb61dae9122d0f508a75ed8e7eb /scss/_custom-forms.scss | |
| parent | c9725926b2f30bed4e37f57c20ef8ffeb2fd233b (diff) | |
| parent | afbaf4350560eaf2135fb0dc6dd761ebb746ac40 (diff) | |
| download | bootstrap-5f316e6dc34f57bfbd0ebf922fe5a01cc6bb38c4.tar.xz bootstrap-5f316e6dc34f57bfbd0ebf922fe5a01cc6bb38c4.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into patch-1
Diffstat (limited to 'scss/_custom-forms.scss')
| -rw-r--r-- | scss/_custom-forms.scss | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index ebca1e1ec..ae5fc3d93 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -142,7 +142,7 @@ background-image: none \9; >>>>>>> twbs/v4-dev background-size: 8px 10px; - border: 1px solid $input-border; + border: $input-border-width solid $input-border-color; // Use vendor prefixes as `appearance` isn't part of the CSS spec. -moz-appearance: none; -webkit-appearance: none; @@ -199,7 +199,7 @@ color: #555; user-select: none; background-color: #fff; - border: .075rem solid #ddd; + border: $input-border-width solid #ddd; border-radius: .25rem; @include box-shadow(inset 0 .2rem .4rem rgba(0,0,0,.05)); } @@ -219,7 +219,7 @@ color: #555; content: "Browse"; background-color: #eee; - border: .075rem solid #ddd; + border: $input-border-width solid #ddd; border-radius: 0 .25rem .25rem 0; } |