From: Mark Otto Date: Tue, 27 Dec 2016 22:50:33 +0000 (-0800) Subject: properly pass focus shadow should you enable shadows X-Git-Tag: v4.0.0-alpha.6~125 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e38c3506e3e0108562e6774afed167549bff0a99;p=thirdparty%2Fbootstrap.git properly pass focus shadow should you enable shadows don't implement for the outline style because outline buttons get no shadow by default --- diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss index 80d0f6cc27..f9981e326a 100644 --- a/scss/mixins/_buttons.scss +++ b/scss/mixins/_buttons.scss @@ -20,7 +20,12 @@ } &:focus, &.focus { - box-shadow: 0 0 0 2px rgba($border, .5); + // Avoid using mixin so we can pass custom focus shadow properly + @if $enable-shadows { + box-shadow: $btn-box-shadow, 0 0 0 2px rgba($border, .5); + } @else { + box-shadow: 0 0 0 2px rgba($border, .5); + } } // Disabled comes first so active can properly restyle