Merge tag 'v3.5.3'

This commit is contained in:
Mike Barnes 2022-05-27 18:31:42 +10:00
commit ed34f4b9a4
292 changed files with 11462 additions and 3972 deletions

View file

@ -88,7 +88,7 @@ class BoostModal extends ImmutablePureComponent {
'public': { icon: 'globe', text: intl.formatMessage(messages.public_short) },
'unlisted': { icon: 'unlock', text: intl.formatMessage(messages.unlisted_short) },
'private': { icon: 'lock', text: intl.formatMessage(messages.private_short) },
'direct': { icon: 'envelope', text: intl.formatMessage(messages.direct_short) },
'direct': { icon: 'at', text: intl.formatMessage(messages.direct_short) },
};
const visibilityIcon = visibilityIconInfo[status.get('visibility')];

View file

@ -234,7 +234,7 @@ class ColumnsArea extends ImmutablePureComponent {
</div>
</div>
<div className='columns-area__panels__main'>
<div className={`columns-area__panels__main ${floatingActionButton && 'with-fab'}`}>
<TabsBar key='tabs' />
{content}
</div>