From 08984ac8cd09bf096a42aac5fd17aa6af79cfc5a Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 12 Feb 2017 17:03:57 -0800
Subject: Remove the outline override from dropdown toggles

fixes #17573
---
 scss/_dropdown.scss | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'scss/_dropdown.scss')

diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index 1c2741a2e..404483e77 100644
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -17,11 +17,6 @@
     border-right: $caret-width solid transparent;
     border-left: $caret-width solid transparent;
   }
-
-  // Prevent the focus on the dropdown toggle when closing dropdowns
-  &:focus {
-    outline: 0;
-  }
 }
 
 .dropup {
-- 
cgit v1.2.3


From 11c2c07e260b99d5d685ce4edb97d7b031da4b3a Mon Sep 17 00:00:00 2001
From: Jesper Strange Klitgaard Christiansen <jesperkc@gmail.com>
Date: Sat, 8 Apr 2017 23:23:07 +0200
Subject: Remove margin-left on caret if empty (#22095)

---
 scss/_dropdown.scss | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'scss/_dropdown.scss')

diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index 404483e77..7c3ad855b 100644
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -17,6 +17,10 @@
     border-right: $caret-width solid transparent;
     border-left: $caret-width solid transparent;
   }
+
+  &:empty::after {
+    margin-left: 0;
+  }
 }
 
 .dropup {
-- 
cgit v1.2.3


From 050aab338b3f6bac15337b79feed0a1c54bdcc6d Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 8 Apr 2017 14:17:06 -0700
Subject: Add dropdown-item-padding-y var

- Closes #21622 which kept the 3px
- Puts variable in proper order for shorthand (y x)
---
 scss/_dropdown.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss/_dropdown.scss')

diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index 7c3ad855b..090fdf1c1 100644
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -65,7 +65,7 @@
 .dropdown-item {
   display: block;
   width: 100%; // For `<button>`s
-  padding: 3px $dropdown-item-padding-x;
+  padding: $dropdown-item-padding-y $dropdown-item-padding-x;
   clear: both;
   font-weight: $font-weight-normal;
   color: $dropdown-link-color;
-- 
cgit v1.2.3