aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorysds <[email protected]>2018-03-13 01:51:00 +0900
committerXhmikosR <[email protected]>2018-03-12 18:51:00 +0200
commit50220acde4bd61c2da4124a133fb8489ed8e7382 (patch)
treea0d5d469738bc2036571d2b41fb7ee0cd2830b5b
parent21061a02ce19001430ccc58016d7034a10feb927 (diff)
downloadbootstrap-50220acde4bd61c2da4124a133fb8489ed8e7382.tar.xz
bootstrap-50220acde4bd61c2da4124a133fb8489ed8e7382.zip
Fix caret alignment (#25719)
-rw-r--r--scss/_button-group.scss8
-rw-r--r--scss/mixins/_caret.scss1
2 files changed, 8 insertions, 1 deletions
diff --git a/scss/_button-group.scss b/scss/_button-group.scss
index c1b826536..549517034 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 40478e492..82aea4210 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;
}