github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-03-09 13:23:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8383 from overleaf/ms-em-settings-page-emails

Browse source 
Move "Primary" badge under the email address in settings

GitOrigin-RevId: ecb11047d9db6feb3bc0128f4a1d490836be7ab5
This commit is contained in:
Eric Mc Sween 2022-06-15 08:46:52 -04:00 committed by Copybot
parent 8cdb746628
commit dfc33805cb
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
services/web/frontend/js/features/settings/components/emails/email.tsx
View file

@ -14,14 +14,16 @@ function Email({ userEmailData }: EmailProps) {
userEmailData.affiliation?.institution || null userEmailData.affiliation?.institution || null
) )
const isPrimary = userEmailData.default
const isProfessional =
userEmailData.confirmedAt &&
userEmailData.affiliation?.institution.confirmed &&
userEmailData.affiliation.licence !== 'free'
const hasBadges = isPrimary || isProfessional
return ( return (
<> <>
{userEmailData.email} {userEmailData.email}
{userEmailData.default ? (
<span className="small ms-1">
<span className="label label-info">Primary</span>
</span>
) : null}
{!userEmailData.confirmedAt && ( {!userEmailData.confirmedAt && (
<div className="small"> <div className="small">
<strong> <strong>
@ -34,13 +36,18 @@ function Email({ userEmailData }: EmailProps) {
)} )}
</div> </div>
)} )}
{userEmailData.confirmedAt && {hasBadges && (
userEmailData.affiliation?.institution.confirmed && <div className="small">
userEmailData.affiliation.licence !== 'free' && ( {isPrimary && (
<div className="small"> <>
<span className="label label-info">Primary</span>{' '}
</>
)}
{isProfessional && (
<span className="label label-primary">{t('professional')}</span> <span className="label label-primary">{t('professional')}</span>
</div> )}
)} </div>
)}
</> </>
) )
} }

1
services/web/frontend/stylesheets/app/account-settings.less
View file

@ -25,6 +25,7 @@
} }
.affiliations-table-cell { .affiliations-table-cell {
padding: 0.5rem; padding: 0.5rem;
overflow-wrap: break-word;
} }
.affiliations-table-row--highlighted { .affiliations-table-row--highlighted {
background-color: tint(@content-alt-bg-color, 6%); background-color: tint(@content-alt-bg-color, 6%);