about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-01-25 20:31:22 +0100
committerGitHub <noreply@github.com>2020-01-25 20:31:22 +0100
commit3591621edc4cc3658199527b0847e997ad1ce0a4 (patch)
treef1f6fcf0ecf1092db7f74bc787a6024ae5967e0d /app/javascript/flavours/glitch/features
parent5bd752081fd72c9899780eaa4b8ce2bd277b1ff0 (diff)
parent5e4d1f699e9f2ea6954a6d2647412f98ed2ca203 (diff)
Merge pull request #1268 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features')
-rw-r--r--app/javascript/flavours/glitch/features/home_timeline/index.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/features/home_timeline/index.js b/app/javascript/flavours/glitch/features/home_timeline/index.js
index 457ac051c..5e36e5f76 100644
--- a/app/javascript/flavours/glitch/features/home_timeline/index.js
+++ b/app/javascript/flavours/glitch/features/home_timeline/index.js
@@ -142,12 +142,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}`}