From ffcbdb5a1c52366e84b2c15999d83abc8ad36dbf Mon Sep 17 00:00:00 2001 From: Patrick Yeo Date: Tue, 2 Jan 2018 13:19:55 -0800 Subject: [PATCH] Mixin `button-outline-variant` should retain active box shadow when focused --- scss/mixins/_buttons.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss index c2ab602ef7..e6ccbc6d48 100644 --- a/scss/mixins/_buttons.scss +++ b/scss/mixins/_buttons.scss @@ -86,7 +86,11 @@ &:focus { // Avoid using mixin so we can pass custom focus shadow properly - box-shadow: 0 0 0 $btn-focus-width rgba($color, .5); + @if $enable-shadows and $btn-active-box-shadow != none { + box-shadow: $btn-active-box-shadow, 0 0 0 $btn-focus-width rgba($color, .5); + } @else { + box-shadow: 0 0 0 $btn-focus-width rgba($color, .5); + } } } }