From 7d72b9ed4b6729be49f361fcb7b0aa01f960b9db Mon Sep 17 00:00:00 2001 From: Merrin Macleod Date: Tue, 9 Jul 2019 04:05:07 +0300 Subject: [PATCH 1/3] Darken hover colors instead of using the color-yiq() function --- scss/mixins/_buttons.scss | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss index 4bb9feb8ae91..c13f3895346e 100644 --- a/scss/mixins/_buttons.scss +++ b/scss/mixins/_buttons.scss @@ -69,7 +69,9 @@ @mixin button-outline-variant( $color, - $color-hover: color-contrast($color), + $color-hover: color-yiq($hover-background), + $hover-background: mix($color, #FFF, 10%), + $hover-border: $color, $active-background: $color, $active-border: $color, $active-color: color-contrast($active-background) @@ -79,8 +81,8 @@ &:hover { color: $color-hover; - background-color: $active-background; - border-color: $active-border; + background-color: $hover-background; + border-color: $hover-border; } &:focus, From 056aa2618e60ffc8df0258aa222ae0006a7d0e26 Mon Sep 17 00:00:00 2001 From: Martijn Cuppens Date: Fri, 9 Aug 2019 14:34:32 +0300 Subject: [PATCH 2/3] Darken hover colors instead of using the color-yiq() function --- scss/mixins/_buttons.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss index c13f3895346e..d4a089f771cb 100644 --- a/scss/mixins/_buttons.scss +++ b/scss/mixins/_buttons.scss @@ -69,9 +69,9 @@ @mixin button-outline-variant( $color, - $color-hover: color-yiq($hover-background), - $hover-background: mix($color, #FFF, 10%), - $hover-border: $color, + $color-hover: color-level($color, 2), + $hover-background: rgba($color, .1), + $hover-border: color-level($color, 2), $active-background: $color, $active-border: $color, $active-color: color-contrast($active-background) From e3fc4ac015618d0aae6499b9d9de349a13117940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= Date: Fri, 15 May 2020 15:56:46 +0200 Subject: [PATCH 3/3] Consistent `button-outline-variant()` args --- scss/mixins/_buttons.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss index d4a089f771cb..11962955aea5 100644 --- a/scss/mixins/_buttons.scss +++ b/scss/mixins/_buttons.scss @@ -69,9 +69,9 @@ @mixin button-outline-variant( $color, - $color-hover: color-level($color, 2), $hover-background: rgba($color, .1), $hover-border: color-level($color, 2), + $hover-color: color-level($color, 2), $active-background: $color, $active-border: $color, $active-color: color-contrast($active-background) @@ -80,7 +80,7 @@ border-color: $color; &:hover { - color: $color-hover; + color: $hover-color; background-color: $hover-background; border-color: $hover-border; }