diff options
author | ThibG <thib@sitedethib.com> | 2020-01-25 19:40:36 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-25 20:05:36 +0100 |
commit | 5e4d1f699e9f2ea6954a6d2647412f98ed2ca203 (patch) | |
tree | f1f6fcf0ecf1092db7f74bc787a6024ae5967e0d /app/javascript/flavours/glitch/features | |
parent | 98d5ab6be9a48ab190ca941164d17afdbe3ea46e (diff) |
[Glitch] Fix “new items glow” being displayed above settings and announcements
Port 90b13ffd009a431dbe98c37bc92ee59a6f0535f2 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Diffstat (limited to 'app/javascript/flavours/glitch/features')
-rw-r--r-- | app/javascript/flavours/glitch/features/home_timeline/index.js | 3 |
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}`} |