From 6a27618d211da5eef90cd163f623446f88bf03dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= Date: Fri, 4 Dec 2020 17:55:50 +0200 Subject: [PATCH] fix(RTL) --- scss/_popover.scss | 32 ++++++++++++++++---------------- scss/_tooltip.scss | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/scss/_popover.scss b/scss/_popover.scss index af8e3c80bb1f..e4f686043c7e 100644 --- a/scss/_popover.scss +++ b/scss/_popover.scss @@ -58,24 +58,24 @@ .bs-popover-end { // Overrule margin set by popper.js - margin-left: $popover-arrow-height !important #{"/* rtl:ignore */"}; // stylelint-disable-line declaration-no-important + margin-left: $popover-arrow-height !important; // stylelint-disable-line declaration-no-important > .popover-arrow { - left: subtract(-$popover-arrow-height, $popover-border-width) #{"/* rtl:ignore */"}; + left: subtract(-$popover-arrow-height, $popover-border-width); width: $popover-arrow-height; height: $popover-arrow-width; margin: $popover-border-radius 0; // make sure the arrow does not touch the popover's rounded corners &::before { - left: 0 #{"/* rtl:ignore */"}; - border-width: ($popover-arrow-width / 2) $popover-arrow-height ($popover-arrow-width / 2) 0 #{"/* rtl:ignore */"}; - border-right-color: $popover-arrow-outer-color #{"/* rtl:ignore */"}; + left: 0; + border-width: ($popover-arrow-width / 2) $popover-arrow-height ($popover-arrow-width / 2) 0; + border-right-color: $popover-arrow-outer-color; } &::after { - left: $popover-border-width #{"/* rtl:ignore */"}; - border-width: ($popover-arrow-width / 2) $popover-arrow-height ($popover-arrow-width / 2) 0 #{"/* rtl:ignore */"}; - border-right-color: $popover-arrow-color #{"/* rtl:ignore */"}; + left: $popover-border-width; + border-width: ($popover-arrow-width / 2) $popover-arrow-height ($popover-arrow-width / 2) 0; + border-right-color: $popover-arrow-color; } } } @@ -115,24 +115,24 @@ .bs-popover-start { // Overrule margin set by popper.js - margin-right: $popover-arrow-height !important #{"/* rtl:ignore */"}; // stylelint-disable-line declaration-no-important + margin-right: $popover-arrow-height !important; // stylelint-disable-line declaration-no-important > .popover-arrow { - right: subtract(-$popover-arrow-height, $popover-border-width) #{"/* rtl:ignore */"}; + right: subtract(-$popover-arrow-height, $popover-border-width); width: $popover-arrow-height; height: $popover-arrow-width; margin: $popover-border-radius 0; // make sure the arrow does not touch the popover's rounded corners &::before { - right: 0 #{"/* rtl:ignore */"}; - border-width: ($popover-arrow-width / 2) 0 ($popover-arrow-width / 2) $popover-arrow-height #{"/* rtl:ignore */"}; - border-left-color: $popover-arrow-outer-color #{"/* rtl:ignore */"}; + right: 0; + border-width: ($popover-arrow-width / 2) 0 ($popover-arrow-width / 2) $popover-arrow-height; + border-left-color: $popover-arrow-outer-color; } &::after { - right: $popover-border-width #{"/* rtl:ignore */"}; - border-width: ($popover-arrow-width / 2) 0 ($popover-arrow-width / 2) $popover-arrow-height #{"/* rtl:ignore */"}; - border-left-color: $popover-arrow-color #{"/* rtl:ignore */"}; + right: $popover-border-width; + border-width: ($popover-arrow-width / 2) 0 ($popover-arrow-width / 2) $popover-arrow-height; + border-left-color: $popover-arrow-color; } } } diff --git a/scss/_tooltip.scss b/scss/_tooltip.scss index 60c860c6746b..2993bf7dedd6 100644 --- a/scss/_tooltip.scss +++ b/scss/_tooltip.scss @@ -47,14 +47,14 @@ padding: 0 $tooltip-arrow-height; .tooltip-arrow { - left: 0 #{"/* rtl:ignore */"}; + left: 0; width: $tooltip-arrow-height; height: $tooltip-arrow-width; &::before { - right: -1px #{"/* rtl:ignore */"}; - border-width: ($tooltip-arrow-width / 2) $tooltip-arrow-height ($tooltip-arrow-width / 2) 0 #{"/* rtl:ignore */"}; - border-right-color: $tooltip-arrow-color #{"/* rtl:ignore */"}; + right: -1px; + border-width: ($tooltip-arrow-width / 2) $tooltip-arrow-height ($tooltip-arrow-width / 2) 0; + border-right-color: $tooltip-arrow-color; } } } @@ -77,14 +77,14 @@ padding: 0 $tooltip-arrow-height; .tooltip-arrow { - right: 0 #{"/* rtl:ignore */"}; + right: 0; width: $tooltip-arrow-height; height: $tooltip-arrow-width; &::before { - left: -1px #{"/* rtl:ignore */"}; - border-width: ($tooltip-arrow-width / 2) 0 ($tooltip-arrow-width / 2) $tooltip-arrow-height #{"/* rtl:ignore */"}; - border-left-color: $tooltip-arrow-color #{"/* rtl:ignore */"}; + left: -1px; + border-width: ($tooltip-arrow-width / 2) 0 ($tooltip-arrow-width / 2) $tooltip-arrow-height; + border-left-color: $tooltip-arrow-color; } } }