Merge branch 'master' into glitch-soc/merge-upstream

2020-01-25 19:46:24 +01:00
parent 5bd752081f 90b13ffd00
commit 3d9310bf3f
4 changed files with 34 additions and 10 deletions
--- a/app/javascript/mastodon/features/home_timeline/index.js
+++ b/app/javascript/mastodon/features/home_timeline/index.js
@@ -143,12 +143,11 @@ class HomeTimeline extends React.PureComponent {
          pinned={pinned}
          multiColumn={multiColumn}
          extraButton={announcementsButton}
+          appendContent={hasAnnouncements && showAnnouncements && <AnnouncementsContainer />}
        >
          <ColumnSettingsContainer />
        </ColumnHeader>

-        {hasAnnouncements && showAnnouncements && <AnnouncementsContainer />}
-
        <StatusListContainer
          trackScroll={!pinned}
          scrollKey={`home_timeline-${columnId}`}