mirror of
https://github.com/yu-i-i/overleaf-cep.git
synced 2026-11-14 06:03:45 +01:00
[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:
@@ -130,6 +130,9 @@ export default function EditMember({
|
||||
)
|
||||
}
|
||||
|
||||
const confirmRemoval =
|
||||
privileges !== member.privileges && privilegeChangePending
|
||||
|
||||
return (
|
||||
<form
|
||||
className={bsVersion({ bs3: 'form-horizontal' })}
|
||||
@@ -166,7 +169,7 @@ export default function EditMember({
|
||||
}
|
||||
className={
|
||||
shouldWarnMember() || member.pendingEditor
|
||||
? 'text-warning'
|
||||
? 'project-member-warning'
|
||||
: undefined
|
||||
}
|
||||
/>
|
||||
@@ -188,32 +191,37 @@ export default function EditMember({
|
||||
</div>
|
||||
</OLCol>
|
||||
|
||||
<OLCol xs={2}>
|
||||
{privileges !== member.privileges && privilegeChangePending && (
|
||||
<OLCol xs={5} className="project-member-actions">
|
||||
{confirmRemoval && (
|
||||
<ChangePrivilegesActions
|
||||
handleReset={() => setPrivileges(member.privileges)}
|
||||
/>
|
||||
)}
|
||||
</OLCol>
|
||||
|
||||
<OLCol xs={3} className="project-member-select">
|
||||
{hasBeenDowngraded && (
|
||||
<BootstrapVersionSwitcher
|
||||
bs3={<Icon type="warning" fw />}
|
||||
bs5={<MaterialIcon type="warning" className="text-warning" />}
|
||||
<div className="project-member-select">
|
||||
{hasBeenDowngraded && !confirmRemoval && (
|
||||
<BootstrapVersionSwitcher
|
||||
bs3={<Icon type="warning" fw />}
|
||||
bs5={
|
||||
<MaterialIcon
|
||||
type="warning"
|
||||
className="project-member-warning"
|
||||
/>
|
||||
}
|
||||
/>
|
||||
)}
|
||||
|
||||
<SelectPrivilege
|
||||
value={privileges}
|
||||
handleChange={value => {
|
||||
if (value) {
|
||||
handlePrivilegeChange(value.key)
|
||||
}
|
||||
}}
|
||||
hasBeenDowngraded={hasBeenDowngraded && !confirmRemoval}
|
||||
canAddCollaborators={canAddCollaborators}
|
||||
/>
|
||||
)}
|
||||
|
||||
<SelectPrivilege
|
||||
value={privileges}
|
||||
handleChange={value => {
|
||||
if (value) {
|
||||
handlePrivilegeChange(value.key)
|
||||
}
|
||||
}}
|
||||
hasBeenDowngraded={hasBeenDowngraded}
|
||||
canAddCollaborators={canAddCollaborators}
|
||||
/>
|
||||
</div>
|
||||
</OLCol>
|
||||
</OLFormGroup>
|
||||
</form>
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@ export default function ShareProjectModalContent({
|
||||
<OLModalTitle>{t('share_project')}</OLModalTitle>
|
||||
</OLModalHeader>
|
||||
|
||||
<OLModalBody className="modal-body-share modal-link-share-new">
|
||||
<OLModalBody className="modal-body-share modal-link-share">
|
||||
<div className="container-fluid">
|
||||
<Suspense fallback={<FullSizeLoadingSpinner minHeight="15rem" />}>
|
||||
{isRestrictedTokenMember ? (
|
||||
|
||||
@@ -172,7 +172,7 @@
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.modal-link-share-new {
|
||||
.modal-link-share {
|
||||
.invite-controls {
|
||||
padding: 0;
|
||||
background-color: transparent;
|
||||
|
||||
@@ -106,6 +106,10 @@
|
||||
font-size: $font-size-sm;
|
||||
}
|
||||
}
|
||||
|
||||
.project-member-warning {
|
||||
color: var(--content-warning-dark);
|
||||
}
|
||||
}
|
||||
|
||||
.project-member .text-left,
|
||||
@@ -165,7 +169,7 @@
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.modal-link-share-new {
|
||||
.modal-link-share {
|
||||
.invite-controls {
|
||||
padding: 0;
|
||||
background-color: transparent;
|
||||
@@ -180,9 +184,19 @@
|
||||
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 {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 0;
|
||||
|
||||
.select-wrapper {
|
||||
max-width: 175px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user