From 822cd0cc2545e257389d09f251060c8297c4ccdb Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Tue, 8 Oct 2019 12:11:19 -0300
Subject: [PATCH 1/2] fix(b-dropdown-form): fix SCSS styling when paced in a
 nav dropdown (fixes #4220)

---
 src/components/dropdown/_dropdown-form.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/dropdown/_dropdown-form.scss b/src/components/dropdown/_dropdown-form.scss
index e6b247d89a4..4615719cb68 100644
--- a/src/components/dropdown/_dropdown-form.scss
+++ b/src/components/dropdown/_dropdown-form.scss
@@ -6,7 +6,8 @@ $bv-dropdown-form-defined: false !default;
 
   // Custom styles for <b-dropdown-form>
   // Based on class `.dropdown-item`
-  .dropdown.b-dropdown {
+  .dropdown.b-dropdown,
+  .dropdown.b-nav-dropdown {
     .b-dropdown-form {
       display: inline-block;
       padding: $dropdown-item-padding-y $dropdown-item-padding-x;

From a21f2c54ccd73af846015442f1fc2fddc49b0a32 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Tue, 8 Oct 2019 12:30:11 -0300
Subject: [PATCH 2/2] Update _dropdown-form.scss

---
 src/components/dropdown/_dropdown-form.scss | 53 ++++++++++-----------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/src/components/dropdown/_dropdown-form.scss b/src/components/dropdown/_dropdown-form.scss
index 4615719cb68..c1528e73447 100644
--- a/src/components/dropdown/_dropdown-form.scss
+++ b/src/components/dropdown/_dropdown-form.scss
@@ -6,36 +6,33 @@ $bv-dropdown-form-defined: false !default;
 
   // Custom styles for <b-dropdown-form>
   // Based on class `.dropdown-item`
-  .dropdown.b-dropdown,
-  .dropdown.b-nav-dropdown {
-    .b-dropdown-form {
-      display: inline-block;
-      padding: $dropdown-item-padding-y $dropdown-item-padding-x;
-      width: 100%;
-      clear: both;
-      font-weight: $font-weight-normal;
+  .b-dropdown-form {
+    display: inline-block;
+    padding: $dropdown-item-padding-y $dropdown-item-padding-x;
+    width: 100%;
+    clear: both;
+    font-weight: $font-weight-normal;
 
-      &:focus {
-        // From https://github.com/twbs/bootstrap/blob/master/scss/_reboot.scss
-        // mimicking button:focus styling.
-        // We add important here as anything with tabindex `-1` and focused will not
-        // have a focus ring due to reboot.scss and it's `!important` override.
-        // Needed for keyboard navigation high-lighting
-        outline: 1px dotted !important;
-        outline: 5px auto -webkit-focus-ring-color !important;
-      }
+    &:focus {
+      // From https://github.com/twbs/bootstrap/blob/master/scss/_reboot.scss
+      // mimicking button:focus styling.
+      // We add important here as anything with tabindex `-1` and focused will not
+      // have a focus ring due to reboot.scss and it's `!important` override.
+      // Needed for keyboard navigation high-lighting
+      outline: 1px dotted !important;
+      outline: 5px auto -webkit-focus-ring-color !important;
+    }
 
-      &.disabled,
-      &:disabled {
-        outline: 0 !important;
-        color: $dropdown-link-disabled-color;
-        pointer-events: none;
-        // background-color: transparent;
-        // Remove CSS gradients if they're enabled
-        // @if $enable-gradients {
-        //   background-image: none;
-        // }
-      }
+    &.disabled,
+    &:disabled {
+      outline: 0 !important;
+      color: $dropdown-link-disabled-color;
+      pointer-events: none;
+      // background-color: transparent;
+      // Remove CSS gradients if they're enabled
+      // @if $enable-gradients {
+      //   background-image: none;
+      // }
     }
   }
 }