diff options
| author | Mark Otto <[email protected]> | 2016-05-09 10:17:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-05-09 10:17:27 -0700 |
| commit | 3daeb58ac3e6251067948f4564f1bc362b734667 (patch) | |
| tree | 356170af013e24477bb569c8fe29c2586dff4ea4 | |
| parent | 6b33c083106be2eae5e3faaece04aa6dc05c0d62 (diff) | |
| parent | 585e5e9adfccfa8eb73073fb26bdf6523d426e42 (diff) | |
| download | bootstrap-3daeb58ac3e6251067948f4564f1bc362b734667.tar.xz bootstrap-3daeb58ac3e6251067948f4564f1bc362b734667.zip | |
Merge branch 'add-input-focus-variables' of https://github.com/kevinkucharczyk/bootstrap into kevinkucharczyk-add-input-focus-variables
| -rw-r--r-- | scss/_variables.scss | 2 | ||||
| -rw-r--r-- | scss/mixins/_forms.scss | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/scss/_variables.scss b/scss/_variables.scss index d4dc984f2..55fa88a8e 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -325,8 +325,10 @@ $input-border-radius: $border-radius !default; $input-border-radius-lg: $border-radius-lg !default; $input-border-radius-sm: $border-radius-sm !default; +$input-bg-focus: $input-bg; $input-border-focus: #66afe9 !default; $input-box-shadow-focus: rgba(102,175,233,.6) !default; +$input-color-focus: $input-color; $input-color-placeholder: #999 !default; diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss index fde829531..ecda4463f 100644 --- a/scss/mixins/_forms.scss +++ b/scss/mixins/_forms.scss @@ -56,7 +56,9 @@ // contrast against a dark gray background. @mixin form-control-focus() { &:focus { + color: $input-color-focus; border-color: $input-border-focus; + background-color: $input-bg-focus; outline: none; $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px $input-box-shadow-focus; @include box-shadow($shadow); |