From 6fa90306f6b43b2f7e138bd4fe237ebab6cb4ac8 Mon Sep 17 00:00:00 2001 From: Ben Biggs Date: Wed, 7 Aug 2019 15:25:16 -0500 Subject: [PATCH] fix(input): add different parameter for message color vs help color --- core/scss/components/input/input.scss | 8 ++++---- core/scss/components/input/mixins.scss | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/scss/components/input/input.scss b/core/scss/components/input/input.scss index 857dd1e698..aae43105bb 100644 --- a/core/scss/components/input/input.scss +++ b/core/scss/components/input/input.scss @@ -190,7 +190,7 @@ $color-clear: $input__clear-icon__color, $color-clear-hover: $input__clear-icon__color--hover, $color-disabled: $input__font-color--disabled, - $color-message: $input__font-color--help, + $color-help: $input__font-color--help, $color-placeholder: $input__font-color--placeholder, $color-read-only: $input__font-color--read-only ); @@ -202,7 +202,7 @@ $background-color-hover: $input__background--hover--contrast, $border-color: $input__border-color--contrast, $color-disabled: $input__font-color--disabled--contrast, - $color-message: $input__font-color--help--contrast, + $color-help: $input__font-color--help--contrast, $color-read-only: $input__font-color ); } @@ -218,7 +218,7 @@ $color-clear: $input__clear-icon__color--dark, $color-clear-hover: $input__clear-icon__color--hover--dark, $color-disabled: $input__font-color--disabled--dark, - $color-message: $input__font-color--help--dark, + $color-help: $input__font-color--help--dark, $color-placeholder: $input__font-color--placeholder--dark, $color-read-only: $input__font-color--read-only--dark ); @@ -228,7 +228,7 @@ @include input-color( $background-color-hover: $input__background--hover--dark--contrast, $border-color: $input__border-color--dark--contrast, - $color-message: $input__font-color--help--dark--contrast + $color-help: $input__font-color--help--dark--contrast ); } } diff --git a/core/scss/components/input/mixins.scss b/core/scss/components/input/mixins.scss index 11e6776d56..fd2a856cc5 100644 --- a/core/scss/components/input/mixins.scss +++ b/core/scss/components/input/mixins.scss @@ -40,6 +40,7 @@ $color-clear: null, $color-clear-hover: null, $color-disabled: null, + $color-help: null, $color-message: null, $color-placeholder: null, $color-read-only: null, @@ -128,7 +129,7 @@ .#{$input__class}__help-text, .#{$input__class}__secondary-label { - color: $color-message; + color: $color-help; } }