[web] fix UI regressions on share modal (#23542)

* restore `yellow-40` to the warning label
* adjust actions layout so dropdown always stays readable

GitOrigin-RevId: 60886cd71e7041976fe2467cf7ab946a6ef90be6
This commit is contained in:
Kristina
2025-02-18 09:04:21 +00:00
committed by Copybot
parent 3a898e2b61
commit 61f4e3f9d5
4 changed files with 47 additions and 25 deletions
@@ -130,6 +130,9 @@ export default function EditMember({
) )
} }
const confirmRemoval =
privileges !== member.privileges && privilegeChangePending
return ( return (
<form <form
className={bsVersion({ bs3: 'form-horizontal' })} className={bsVersion({ bs3: 'form-horizontal' })}
@@ -166,7 +169,7 @@ export default function EditMember({
} }
className={ className={
shouldWarnMember() || member.pendingEditor shouldWarnMember() || member.pendingEditor
? 'text-warning' ? 'project-member-warning'
: undefined : undefined
} }
/> />
@@ -188,32 +191,37 @@ export default function EditMember({
</div> </div>
</OLCol> </OLCol>
<OLCol xs={2}> <OLCol xs={5} className="project-member-actions">
{privileges !== member.privileges && privilegeChangePending && ( {confirmRemoval && (
<ChangePrivilegesActions <ChangePrivilegesActions
handleReset={() => setPrivileges(member.privileges)} handleReset={() => setPrivileges(member.privileges)}
/> />
)} )}
</OLCol>
<OLCol xs={3} className="project-member-select"> <div className="project-member-select">
{hasBeenDowngraded && ( {hasBeenDowngraded && !confirmRemoval && (
<BootstrapVersionSwitcher <BootstrapVersionSwitcher
bs3={<Icon type="warning" fw />} bs3={<Icon type="warning" fw />}
bs5={<MaterialIcon type="warning" className="text-warning" />} bs5={
<MaterialIcon
type="warning"
className="project-member-warning"
/>
}
/>
)}
<SelectPrivilege
value={privileges}
handleChange={value => {
if (value) {
handlePrivilegeChange(value.key)
}
}}
hasBeenDowngraded={hasBeenDowngraded && !confirmRemoval}
canAddCollaborators={canAddCollaborators}
/> />
)} </div>
<SelectPrivilege
value={privileges}
handleChange={value => {
if (value) {
handlePrivilegeChange(value.key)
}
}}
hasBeenDowngraded={hasBeenDowngraded}
canAddCollaborators={canAddCollaborators}
/>
</OLCol> </OLCol>
</OLFormGroup> </OLFormGroup>
</form> </form>
@@ -50,7 +50,7 @@ export default function ShareProjectModalContent({
<OLModalTitle>{t('share_project')}</OLModalTitle> <OLModalTitle>{t('share_project')}</OLModalTitle>
</OLModalHeader> </OLModalHeader>
<OLModalBody className="modal-body-share modal-link-share-new"> <OLModalBody className="modal-body-share modal-link-share">
<div className="container-fluid"> <div className="container-fluid">
<Suspense fallback={<FullSizeLoadingSpinner minHeight="15rem" />}> <Suspense fallback={<FullSizeLoadingSpinner minHeight="15rem" />}>
{isRestrictedTokenMember ? ( {isRestrictedTokenMember ? (
@@ -172,7 +172,7 @@
outline: none; outline: none;
} }
.modal-link-share-new { .modal-link-share {
.invite-controls { .invite-controls {
padding: 0; padding: 0;
background-color: transparent; background-color: transparent;
@@ -106,6 +106,10 @@
font-size: $font-size-sm; font-size: $font-size-sm;
} }
} }
.project-member-warning {
color: var(--content-warning-dark);
}
} }
.project-member .text-left, .project-member .text-left,
@@ -165,7 +169,7 @@
outline: none; outline: none;
} }
.modal-link-share-new { .modal-link-share {
.invite-controls { .invite-controls {
padding: 0; padding: 0;
background-color: transparent; background-color: transparent;
@@ -180,9 +184,19 @@
margin-bottom: calc(var(--line-height-03) / 2); margin-bottom: calc(var(--line-height-03) / 2);
} }
.project-member-actions {
display: flex;
align-items: center;
justify-content: flex-end;
padding: 0;
}
.project-member-select { .project-member-select {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 0;
.select-wrapper {
max-width: 175px;
}
} }
} }