diff options
| author | Chris Rebert <[email protected]> | 2015-11-14 22:32:42 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-11-14 22:40:43 -0800 |
| commit | 2d02910e014061b504a42705f84e415e37413b3a (patch) | |
| tree | 9f86f329a048b5c62dbbc51147292849b434f5ff | |
| parent | 2ea8950b26b22c296c859949f648a37cbbd4ceaa (diff) | |
| download | bootstrap-2d02910e014061b504a42705f84e415e37413b3a.tar.xz bootstrap-2d02910e014061b504a42705f84e415e37413b3a.zip | |
$input-border => $input-border-color
| -rw-r--r-- | scss/_custom-forms.scss | 2 | ||||
| -rw-r--r-- | scss/_forms.scss | 2 | ||||
| -rw-r--r-- | scss/_variables.scss | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index 1fec265c6..72580352d 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -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: 1px solid $input-border; + border: 1px solid $input-border-color; // Use vendor prefixes as `appearance` isn't part of the CSS spec. -moz-appearance: none; -webkit-appearance: none; diff --git a/scss/_forms.scss b/scss/_forms.scss index 8796cbb77..32c9c66e0 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -14,7 +14,7 @@ background-color: $input-bg; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214. background-image: none; - border: $border-width solid $input-border; + border: $border-width solid $input-border-color; // Note: This has no effect on <select>s in some browsers, due to the limited stylability of `<select>`s in CSS. @include border-radius($input-border-radius); @include box-shadow($input-box-shadow); diff --git a/scss/_variables.scss b/scss/_variables.scss index ba9d663fd..78d6d066d 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -265,7 +265,7 @@ $input-bg: #fff !default; $input-bg-disabled: $gray-lighter !default; $input-color: $gray !default; -$input-border: #ccc !default; +$input-border-color: #ccc !default; $input-box-shadow: inset 0 1px 1px rgba(0,0,0,.075) !default; $input-border-radius: $border-radius !default; @@ -290,7 +290,7 @@ $input-height-sm: (($font-size-sm * $line-height-sm) + ($input-pa $form-group-margin-bottom: $spacer-y !default; $input-group-addon-bg: $gray-lighter !default; -$input-group-addon-border-color: $input-border !default; +$input-group-addon-border-color: $input-border-color !default; $cursor-disabled: not-allowed !default; |