From 6067de0e8fb27442ac5d23d65dd34efc71bba307 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 27 May 2016 14:08:31 -0400
Subject: [PATCH] FIX: Don't hide the button at the top, only the bottom

---
 .../javascripts/discourse/widgets/topic-timeline.js.es6       | 4 +++-
 app/assets/stylesheets/desktop/topic-timeline.scss            | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
index 38d2ccdc705..3adc5286796 100644
--- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
@@ -187,7 +187,9 @@ createWidget('timeline-scrollarea', {
 createWidget('topic-timeline-container', {
   tagName: 'div.timeline-container',
   buildClasses(attrs) {
-    if (attrs.dockAt !== null) { return 'timeline-docked'; }
+    if (attrs.dockAt !== null) {
+      return attrs.dockAt > 0 ? 'timeline-docked timeline-docked-bottom' : 'timeline-docked';
+    }
   },
 
   buildAttributes(attrs) {
diff --git a/app/assets/stylesheets/desktop/topic-timeline.scss b/app/assets/stylesheets/desktop/topic-timeline.scss
index c3cc820f409..f49ce696d14 100644
--- a/app/assets/stylesheets/desktop/topic-timeline.scss
+++ b/app/assets/stylesheets/desktop/topic-timeline.scss
@@ -12,6 +12,9 @@
   &.timeline-docked {
     position: absolute;
 
+  }
+
+  &.timeline-docked-bottom {
     .timeline-footer-controls {
       background-color: yellow;
       visibility: hidden;