From 92900da881745583515edd91bb977ae488d78f19 Mon Sep 17 00:00:00 2001 From: "Andrea N. Cardona" Date: Mon, 3 May 2021 13:39:22 -0600 Subject: [PATCH] fix(tooltip): tooltip margin bug (#8461) * fix(tooltip): tooltip margin bug * fix(tooltip): fix margin bug * fix(tooltip): fix margin bug -pt.3 * Update _tooltip.scss * update dup margin _tooltip.scss * fix(tooltip): margin bug - top alignment * fix(tooltip): margin bug - top margin left * update margin after build Co-authored-by: TJ Egan --- .../components/src/components/tooltip/_tooltip.scss | 11 +++++++++++ packages/react/src/internal/FloatingMenu.js | 1 - 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/components/src/components/tooltip/_tooltip.scss b/packages/components/src/components/tooltip/_tooltip.scss index d8c7b3fc33d3..0f4541d726a4 100644 --- a/packages/components/src/components/tooltip/_tooltip.scss +++ b/packages/components/src/components/tooltip/_tooltip.scss @@ -500,6 +500,8 @@ } &[data-floating-menu-direction='left'] { + margin-left: calc(#{$spacing-03} * -1); + .#{$prefix}--tooltip__caret { top: 50%; // left position has an additional space between caret and tooltip @@ -510,6 +512,8 @@ } &[data-floating-menu-direction='top'] { + margin-top: calc(#{$spacing-03} * -1); + .#{$prefix}--tooltip__caret { top: auto; bottom: calc(#{$caret-size * (-1)} + 1px); @@ -518,6 +522,8 @@ } &[data-floating-menu-direction='right'] { + margin-left: $spacing-03; + .#{$prefix}--tooltip__caret { top: 50%; right: auto; @@ -525,6 +531,10 @@ transform: rotate(270deg) translate(50%, -50%); } } + + &[data-floating-menu-direction='bottom'] { + margin-top: $spacing-03; + } } .#{$prefix}--tooltip__heading { @@ -535,6 +545,7 @@ .#{$prefix}--tooltip--shown { display: block; + margin-top: 0; } // Tooltip Definition diff --git a/packages/react/src/internal/FloatingMenu.js b/packages/react/src/internal/FloatingMenu.js index 950b9d732129..cd8f53c9867e 100644 --- a/packages/react/src/internal/FloatingMenu.js +++ b/packages/react/src/internal/FloatingMenu.js @@ -400,7 +400,6 @@ class FloatingMenu extends React.Component { ...styles, ...positioningStyle, position: 'absolute', - margin: 0, opacity: 1, }, });