From acff83527423157a78d03ca234aa48493dbd3ab6 Mon Sep 17 00:00:00 2001 From: Aron Griffis Date: Fri, 10 Nov 2017 11:18:32 -0500 Subject: [PATCH 1/2] Use color-yiq for outline button text. --- 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 1cbe671221d9..06ad6772fa4b 100644 --- a/scss/mixins/_buttons.scss +++ b/scss/mixins/_buttons.scss @@ -54,14 +54,14 @@ } } -@mixin button-outline-variant($color, $color-hover: #fff, $active-background: $color, $active-border: $color) { +@mixin button-outline-variant($color, $color-hover: color-yiq($color), $active-background: $color, $active-border: $color) { color: $color; background-color: transparent; background-image: none; border-color: $color; &:hover { - color: color-yiq($color); + color: $color-hover; background-color: $active-background; border-color: $active-border; } From b73228b699de27ade7177f81d0eaa11a9e742ea3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 16 Jan 2018 20:58:16 -0800 Subject: [PATCH 2/2] Ditch if/else block now that we have hover color-yiq in the mixin --- scss/_buttons.scss | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scss/_buttons.scss b/scss/_buttons.scss index 41b7068224f9..da6d87916dd8 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -68,11 +68,7 @@ fieldset:disabled a.btn { @each $color, $value in $theme-colors { .btn-outline-#{$color} { - @if $color == "light" { - @include button-outline-variant($value, $gray-900); - } @else { - @include button-outline-variant($value, $white); - } + @include button-outline-variant($value); } }