From 08e62347e15c0188d8dc630031e4b70050f178bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Mon, 15 Jun 2015 17:27:56 +0200
Subject: [PATCH] FIX: blue notification bar overlaps text on New/Unread tab

---
 app/assets/javascripts/discourse/templates/discovery.hbs    | 2 +-
 .../javascripts/discourse/templates/discovery/topics.hbs    | 2 +-
 app/assets/stylesheets/common/base/_topic-list.scss         | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/discovery.hbs b/app/assets/javascripts/discourse/templates/discovery.hbs
index be18d07bae7..195db18b2e7 100644
--- a/app/assets/javascripts/discourse/templates/discovery.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery.hbs
@@ -12,7 +12,7 @@
 
 {{conditional-loading-spinner condition=loading}}
 
-<div {{bind-attr class=":container :list-container loading:hidden"}}>
+<div class="container list-container {{if loading 'hidden'}}">
   <div class="row">
     <div class="full-width">
       <div id='header-list-area'>
diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
index 9c573ee3d2a..f3e452a4ab0 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
@@ -23,7 +23,7 @@
     </div>
   {{/if}}
   {{#if topicTrackingState.hasIncoming}}
-    <div class="show-more">
+    <div class="show-more {{if hasTopics 'has-topics'}}">
       <div class='alert alert-info clickable' {{action "showInserted"}}>
         {{count-i18n key="topic_count_" suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
         {{i18n 'click_to_show'}}
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 0b857b0cd45..d6d2fb5b7a7 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -1,8 +1,10 @@
 .show-more {
-  position: absolute;
-  top: 4px;
   width: 100%;
   z-index: 1;
+  &.has-topics {
+    position: absolute;
+    top: 7px;
+  }
 }
 
 .list-controls {