Merge tag 'v3.5.3'

2022-05-27 18:31:42 +10:00 · 2022-05-27 18:31:42 +10:00 · ed34f4b9a4
commit ed34f4b9a4
parent 28ed4adff9 fbcbf7898f
292 changed files with 11462 additions and 3972 deletions
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@ -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>