Skip to content
Merged
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
55 changes: 32 additions & 23 deletions packages/editor/src/components/post-locked-modal/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ export default function PostLockedModal() {
src={ userAvatar }
alt={ __( 'Avatar' ) }
className="editor-post-locked-modal__avatar"
width={ 64 }
height={ 64 }
/>
) }
<div>
Expand Down Expand Up @@ -214,29 +216,36 @@ export default function PostLockedModal() {
</p>
) }
{ ! isTakeover && (
<p>
{ createInterpolateElement(
userDisplayName
? sprintf(
/* translators: %s: user's display name */
__(
'<strong>%s</strong> is currently working on this post (<PreviewLink />), which means you cannot make changes, unless you take over.'
),
userDisplayName
)
: __(
'Another user is currently working on this post (<PreviewLink />), which means you cannot make changes, unless you take over.'
),
{
strong: <strong />,
PreviewLink: (
<ExternalLink href={ previewLink }>
{ __( 'preview' ) }
</ExternalLink>
),
}
) }
</p>
<>
<p>
{ createInterpolateElement(
userDisplayName
? sprintf(
/* translators: %s: user's display name */
__(
'<strong>%s</strong> is currently working on this post (<PreviewLink />), which means you cannot make changes, unless you take over.'
),
userDisplayName
)
: __(
'Another user is currently working on this post (<PreviewLink />), which means you cannot make changes, unless you take over.'
),
{
strong: <strong />,
PreviewLink: (
<ExternalLink href={ previewLink }>
{ __( 'preview' ) }
</ExternalLink>
),
}
) }
</p>
<p>
{ __(
'If you take over, the other user will lose editing control to the post, but their changes will be saved.'
) }
</p>
</>
) }

<Flex
Expand Down
10 changes: 7 additions & 3 deletions packages/editor/src/components/post-locked-modal/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@
@include break-small() {
max-width: $break-mobile;
}

.components-modal__content {
display: flex;
}
}

.editor-post-locked-modal__buttons {
margin-top: $grid-unit-30;
}

.editor-post-locked-modal__avatar {
float: left;
margin: $grid-unit-10;
margin-right: $grid-unit-15;
border-radius: $radius-block-ui;
margin-top: $grid-unit-20;
margin-right: $grid-unit-30;
}