From ed04de430b4786e1d3d74307924610cf40cc84f5 Mon Sep 17 00:00:00 2001 From: David Menc Date: Fri, 23 Aug 2024 09:51:57 +0200 Subject: [PATCH] Remove line between popover and arrow --- src/components/Popover/Popover.module.scss | 32 +++++++++++----------- src/components/Popover/_theme.scss | 6 ++-- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/components/Popover/Popover.module.scss b/src/components/Popover/Popover.module.scss index b4a746bb..1c3d1873 100644 --- a/src/components/Popover/Popover.module.scss +++ b/src/components/Popover/Popover.module.scss @@ -51,52 +51,52 @@ // Sides .isRootAtTop { - bottom: 100%; + bottom: calc(100% + #{theme.$arrow-gap} - #{theme.$arrow-safe-rendering-overlap}); } .isRootAtBottom { - top: 100%; + top: calc(100% + #{theme.$arrow-gap} - #{theme.$arrow-safe-rendering-overlap}); } .isRootAtLeft { - right: 100%; + right: calc(100% + #{theme.$arrow-gap} - #{theme.$arrow-safe-rendering-overlap}); } .isRootAtRight { - left: 100%; + left: calc(100% + #{theme.$arrow-gap} - #{theme.$arrow-safe-rendering-overlap}); } // Arrows .isRootAtTop > .arrow { - top: 100%; + top: calc(100% - #{theme.$arrow-safe-rendering-overlap}); } .isRootAtBottom > .arrow { - bottom: 100%; + bottom: calc(100% - #{theme.$arrow-safe-rendering-overlap}); } .isRootAtLeft > .arrow { - left: 100%; + left: calc(100% - #{theme.$arrow-safe-rendering-overlap}); } .isRootAtRight > .arrow { - right: 100%; + right: calc(100% - #{theme.$arrow-safe-rendering-overlap}); } // Side alignments: top .isRootAtTop.isRootAtCenter { left: 50%; - transform: translate(-50%, #{-1 * theme.$arrow-height}); + transform: translate(-50%, calc(-1 * #{theme.$arrow-height})); } .isRootAtTop.isRootAtStart { left: 0; - transform: translate(0, #{-1 * theme.$arrow-height}); + transform: translate(0, calc(-1 * #{theme.$arrow-height})); } .isRootAtTop.isRootAtEnd { right: 0; - transform: translate(0, #{-1 * theme.$arrow-height}); + transform: translate(0, calc(-1 * #{theme.$arrow-height})); } .isRootAtTop.isRootAtCenter > .arrow { @@ -148,17 +148,17 @@ // Side alignments: left .isRootAtLeft.isRootAtCenter { top: 50%; - transform: translate(#{-1 * theme.$arrow-height}, -50%); + transform: translate(calc(-1 * #{theme.$arrow-height}), -50%); } .isRootAtLeft.isRootAtStart { top: 0; - transform: translate(#{-1 * theme.$arrow-height}, 0); + transform: translate(calc(-1 * #{theme.$arrow-height}), 0); } .isRootAtLeft.isRootAtEnd { bottom: 0; - transform: translate(#{-1 * theme.$arrow-height}, 0); + transform: translate(calc(-1 * #{theme.$arrow-height}), 0); } .isRootAtLeft.isRootAtCenter > .arrow { @@ -216,7 +216,7 @@ } .isRootControlled.isRootAtTop { - transform: translate(0, #{-1 * theme.$arrow-height}); // 2. + transform: translate(0, calc(-1 * #{theme.$arrow-height})); // 2. } .isRootControlled.isRootAtBottom { @@ -224,7 +224,7 @@ } .isRootControlled.isRootAtLeft { - transform: translate(#{-1 * theme.$arrow-height}, 0); // 2. + transform: translate(calc(-1 * #{theme.$arrow-height}), 0); // 2. } .isRootControlled.isRootAtRight { diff --git a/src/components/Popover/_theme.scss b/src/components/Popover/_theme.scss index bb3523cb..59b40e54 100644 --- a/src/components/Popover/_theme.scss +++ b/src/components/Popover/_theme.scss @@ -11,6 +11,8 @@ $color: var(--rui-Popover__color); $background-color: var(--rui-Popover__background-color); $box-shadow: var(--rui-Popover__box-shadow); -$arrow-width: 1rem; -$arrow-height: math.div($arrow-width, 2); // 1. +$arrow-safe-rendering-overlap: 1px; +$arrow-gap: 1px; +$arrow-width: calc(1rem + #{$arrow-safe-rendering-overlap * 2}); +$arrow-height: calc($arrow-width / 2); // 1. $arrow-corner-offset: 0.75rem;