From 50220acde4bd61c2da4124a133fb8489ed8e7382 Mon Sep 17 00:00:00 2001
From: ysds <fellows3@gmail.com>
Date: Tue, 13 Mar 2018 01:51:00 +0900
Subject: [PATCH] Fix caret alignment (#25719)

---
 scss/_button-group.scss | 8 +++++++-
 scss/mixins/_caret.scss | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/scss/_button-group.scss b/scss/_button-group.scss
index c1b826536c..5495170345 100644
--- a/scss/_button-group.scss
+++ b/scss/_button-group.scss
@@ -76,9 +76,15 @@
   padding-right: $btn-padding-x * .75;
   padding-left: $btn-padding-x * .75;
 
-  &::after {
+  &::after,
+  .dropup &::after,
+  .dropright &::after {
     margin-left: 0;
   }
+
+  .dropleft &::before {
+    margin-right: 0;
+  }
 }
 
 .btn-sm + .dropdown-toggle-split {
diff --git a/scss/mixins/_caret.scss b/scss/mixins/_caret.scss
index 40478e4929..82aea42101 100644
--- a/scss/mixins/_caret.scss
+++ b/scss/mixins/_caret.scss
@@ -14,6 +14,7 @@
 
 @mixin caret-right {
   border-top: $caret-width solid transparent;
+  border-right: 0;
   border-bottom: $caret-width solid transparent;
   border-left: $caret-width solid;
 }