From: Patrick Yeo <patrick.yeo@liferay.com>
Date: Tue, 2 Jan 2018 21:19:55 +0000 (-0800)
Subject: Mixin `button-outline-variant` should retain active box shadow when focused
X-Git-Tag: v4.0.0~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffcbdb5a1c52366e84b2c15999d83abc8ad36dbf;p=thirdparty%2Fbootstrap.git

Mixin `button-outline-variant` should retain active box shadow when focused
---

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);
+      }
     }
   }
 }