Merge branch 'account-grow' into 'develop'

Account: don't grow more than needed

Closes #891 and #1017

See merge request soapbox-pub/soapbox-fe!1601
feed-suggestions
Alex Gleason 2022-07-06 15:07:45 +00:00
commit db953b1ec2
2 zmienionych plików z 11 dodań i 13 usunięć

Wyświetl plik

@ -159,7 +159,7 @@ const Account = ({
return (
<div data-testid='account' className='flex-shrink-0 group block w-full' ref={overflowRef}>
<HStack alignItems={actionAlignment} justifyContent='between'>
<HStack alignItems='center' space={3} grow>
<HStack alignItems='center' space={3}>
<ProfilePopper
condition={showProfileHoverCard}
wrapper={(children) => <HoverRefWrapper className='relative' accountId={account.id} inline>{children}</HoverRefWrapper>}

Wyświetl plik

@ -474,18 +474,16 @@ class Status extends ImmutablePureComponent<IStatus, IStatusState> {
{reblogElementMobile}
<div className='mb-4'>
<HStack justifyContent='between' alignItems='start'>
<AccountContainer
key={String(status.getIn(['account', 'id']))}
id={String(status.getIn(['account', 'id']))}
timestamp={status.created_at}
timestampUrl={statusUrl}
action={reblogElement}
hideActions={!reblogElement}
showEdit={!!status.edited_at}
showProfileHoverCard={this.props.hoverable}
/>
</HStack>
<AccountContainer
key={String(status.getIn(['account', 'id']))}
id={String(status.getIn(['account', 'id']))}
timestamp={status.created_at}
timestampUrl={statusUrl}
action={reblogElement}
hideActions={!reblogElement}
showEdit={!!status.edited_at}
showProfileHoverCard={this.props.hoverable}
/>
</div>
<div className='status__content-wrapper'>