From 8cc68757fdf23eab6b2d463dc5d6d0ee4ec2bf23 Mon Sep 17 00:00:00 2001 From: Troy Morehouse Date: Mon, 25 Mar 2019 10:16:16 -0300 Subject: [PATCH 1/3] fix(dropdown): fix hide-caret when dropleft (fixes #2909) Fixes #2909 --- src/components/dropdown/_dropdown.scss | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/dropdown/_dropdown.scss b/src/components/dropdown/_dropdown.scss index 954283006a2..a7900acfcee 100644 --- a/src/components/dropdown/_dropdown.scss +++ b/src/components/dropdown/_dropdown.scss @@ -1,8 +1,15 @@ // Hide the caret for no-caret setting // See: https://github.com/bootstrap-vue/bootstrap-vue/issues/1473 // See: https://github.com/twbs/bootstrap/issues/23724 -.dropdown-toggle { +.dropdown:not(.dropleft) .dropdown-toggle { &.dropdown-toggle-no-caret:after { display: none !important; } } + +// See: https://github.com/bootstrap-vue/bootstrap-vue/issues/2909 +dropdown.dropleft .dropdown-toggle { + &.dropdown-toggle-no-caret:before { + display: none !important; + } +} From f5198dda580a60a613c47650d04a3d691debaa87 Mon Sep 17 00:00:00 2001 From: Troy Morehouse Date: Mon, 25 Mar 2019 10:22:48 -0300 Subject: [PATCH 2/3] Update _dropdown.scss --- src/components/dropdown/_dropdown.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/dropdown/_dropdown.scss b/src/components/dropdown/_dropdown.scss index a7900acfcee..690aa96535d 100644 --- a/src/components/dropdown/_dropdown.scss +++ b/src/components/dropdown/_dropdown.scss @@ -8,7 +8,7 @@ } // See: https://github.com/bootstrap-vue/bootstrap-vue/issues/2909 -dropdown.dropleft .dropdown-toggle { +.dropdown.dropleft .dropdown-toggle { &.dropdown-toggle-no-caret:before { display: none !important; } From 3e270377cb8b34cb749ba2987c644e55481e5992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20M=C3=BCller?= Date: Mon, 25 Mar 2019 14:24:20 +0100 Subject: [PATCH 3/3] Update _dropdown.scss --- src/components/dropdown/_dropdown.scss | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/components/dropdown/_dropdown.scss b/src/components/dropdown/_dropdown.scss index a7900acfcee..de84b0999fc 100644 --- a/src/components/dropdown/_dropdown.scss +++ b/src/components/dropdown/_dropdown.scss @@ -1,15 +1,21 @@ // Hide the caret for no-caret setting // See: https://github.com/bootstrap-vue/bootstrap-vue/issues/1473 // See: https://github.com/twbs/bootstrap/issues/23724 -.dropdown:not(.dropleft) .dropdown-toggle { - &.dropdown-toggle-no-caret:after { - display: none !important; +.dropdown { + &:not(.dropleft) { + .dropdown-toggle { + &.dropdown-toggle-no-caret:after { + display: none !important; + } + } } -} -// See: https://github.com/bootstrap-vue/bootstrap-vue/issues/2909 -dropdown.dropleft .dropdown-toggle { - &.dropdown-toggle-no-caret:before { - display: none !important; + // See: https://github.com/bootstrap-vue/bootstrap-vue/issues/2909 + &.dropleft { + .dropdown-toggle { + &.dropdown-toggle-no-caret:before { + display: none !important; + } + } } }