Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hoort deze styling hier wel thuis?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

eigenlijk niet, maar de Tooltip component zit in de react-component en moet eigenlijk gestyled worden in de client
maar de admin-core zit daar tussenin
admin-core moet eigenlijk niet gestyled zijn, maar de styling van die arrow triangle kan enkel via properties op de tooltip component
dus deze tooltip is wel styled

de enige andere optie die ik zie is die styles laten setten in de admin-core config en ze dan zo doorgeven aan de tooltip component. Maar dat leek me wat overkill voor die ene tooltip die we in de admin-core schermen hebben zitten

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; }
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Tooltip, TooltipContent, TooltipTrigger } from '@meemoo/react-components';

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Willen we deze wijzigingen zo doorduwen?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hoe bedoel je?

import type { IconName } from '@viaa/avo2-components';
import {
Button,
Expand All @@ -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';
Expand Down Expand Up @@ -203,7 +201,12 @@ const PublishContentPageModal: FC<PublishContentPageModalProps> = ({
)
}
/>
<Tooltip position="right" id="publish-content-page-modal__published-at-display-tooltip">
<Tooltip
position="top"
arrowStrokeWidth={1}
arrowStrokeColor="#557891"
arrowFillColor="#edeff2"
>
<TooltipTrigger>
<Icon className="a-info-icon" name={'info' as IconName} size="small" />
</TooltipTrigger>
Expand Down
4 changes: 0 additions & 4 deletions ui/src/react-admin/modules/user/views/UserDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -277,10 +277,6 @@ export const UserDetail: FC<UserDetailProps> = ({
['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')],
[

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Waarom dit ineens weg?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deze is al verwijderd in het verleden, maar blijkbaar bestond deze entry nog, maar dat is niet meer geldig volgens typescript typechecking

alias en alternative_email is gewist geweest aangezien die velden niet gebruikt worden en ze vaak voor problemen zorgen met max-length issues bij registratie

'alternativeEmail',
tText('admin/users/views/user-detail___secundair-email-adres'),
],
])}
{renderDetailRow(
userGroup ? userGroup.label : '-',
Expand Down