From 4d6d046f64050d58b2f30055332da74e6026d7c3 Mon Sep 17 00:00:00 2001 From: Bert Verhelst Date: Mon, 15 Jun 2026 17:23:09 +0200 Subject: [PATCH] fix(AVO-4043): replace avo2 components tooltip with local version https://meemoo.atlassian.net/browse/AVO-4043 using @meemoo/react-components tooltip --- .../components/PublishContentPageModal.scss | 54 +++++++++++-------- .../components/PublishContentPageModal.tsx | 11 ++-- .../modules/user/views/UserDetail.tsx | 4 -- 3 files changed, 39 insertions(+), 30 deletions(-) diff --git a/ui/src/react-admin/modules/content-page/components/PublishContentPageModal.scss b/ui/src/react-admin/modules/content-page/components/PublishContentPageModal.scss index 3b7f4ca74..8f3417432 100644 --- a/ui/src/react-admin/modules/content-page/components/PublishContentPageModal.scss +++ b/ui/src/react-admin/modules/content-page/components/PublishContentPageModal.scss @@ -1,22 +1,32 @@ -.c-content-page-publish-modal__display-date { - margin-top: 3.2rem; - - .o-form-group__label { - font-weight: 500; - } - - .u-spacer { - position: relative; - display: inline-block; - - .c-tooltip-trigger { - position: absolute; - right: 10px; - top: 6px; - } - - .c-tooltip[data-popper-placement^="right"] > .c-tooltip__arrow { - left: -4px; - } - } -} +.c-content-page-publish-modal__display-date { + margin-top: 3.2rem; + + .o-form-group__label { + font-weight: 500; + } + + .u-spacer { + position: relative; + display: inline-block; + + .c-tooltip-trigger { + position: absolute; + right: 10px; + top: 6px; + } + } +} + +.p-content-page-publish-modal { + .c-tooltip-component { + background-color: #edeff2; + border: 1px solid #557891; + border-radius: 0.3rem; + padding: 0.8rem; + color: black; + font-size: 1.2rem; + line-height: 1.428; // 20px equivalent + user-select: none; + pointer-events: none; + margin: 0 !important; } +} diff --git a/ui/src/react-admin/modules/content-page/components/PublishContentPageModal.tsx b/ui/src/react-admin/modules/content-page/components/PublishContentPageModal.tsx index 7d0a5fef4..8ea6c0cd7 100644 --- a/ui/src/react-admin/modules/content-page/components/PublishContentPageModal.tsx +++ b/ui/src/react-admin/modules/content-page/components/PublishContentPageModal.tsx @@ -1,3 +1,4 @@ +import { Tooltip, TooltipContent, TooltipTrigger } from '@meemoo/react-components'; import type { IconName } from '@viaa/avo2-components'; import { Button, @@ -13,9 +14,6 @@ import { Toolbar, ToolbarItem, ToolbarRight, - Tooltip, - TooltipContent, - TooltipTrigger, } from '@viaa/avo2-components'; import { parseISO, setHours, setMinutes, setSeconds } from 'date-fns'; import type { FC } from 'react'; @@ -203,7 +201,12 @@ const PublishContentPageModal: FC = ({ ) } /> - + diff --git a/ui/src/react-admin/modules/user/views/UserDetail.tsx b/ui/src/react-admin/modules/user/views/UserDetail.tsx index ccf776380..233051365 100644 --- a/ui/src/react-admin/modules/user/views/UserDetail.tsx +++ b/ui/src/react-admin/modules/user/views/UserDetail.tsx @@ -277,10 +277,6 @@ export const UserDetail: FC = ({ ['bio', tText('admin/users/views/user-detail___bio')], ['stamboek', tText('admin/users/views/user-detail___stamboek-nummer')], ['email', tText('admin/users/views/user-detail___primair-email-adres')], - [ - 'alternativeEmail', - tText('admin/users/views/user-detail___secundair-email-adres'), - ], ])} {renderDetailRow( userGroup ? userGroup.label : '-',