From 13bf6a6d7bfdc448adfe961d10dd580cdeffa0b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Mon, 9 Nov 2015 11:24:19 +0100
Subject: [PATCH] UX: move 'new dot' in mobile topics lists at the end of the
 topic title

---
 .../discourse/templates/list/post-count-or-badges.raw.hbs    | 5 +----
 .../templates/mobile/components/basic-topic-list.hbs         | 4 +++-
 .../discourse/templates/mobile/discovery/categories.hbs      | 4 +++-
 .../discourse/templates/mobile/list/topic_list_item.raw.hbs  | 3 +++
 app/assets/stylesheets/mobile/topic-list.scss                | 4 ++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs b/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs
index 88dfe8f00..4e41ba326 100644
--- a/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/post-count-or-badges.raw.hbs
@@ -1,8 +1,5 @@
 {{#if view.showBadges}}
   {{raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl}}
 {{else}}
-  {{#if topic.unseen}}
-    <span class="badge-notification new-topic"></span>
-  {{/if}}
   {{raw "list/posts-count-column" topic=topic tagName="div"}}
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index 06af1df5d..92a502662 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -8,7 +8,9 @@
             <div class='main-link'>
               {{topic-status topic=t}}
               {{topic-link t}}
-
+              {{#if t.unseen}}
+                <span class="badge-notification new-topic"></span>
+              {{/if}}
               {{#if t.hasExcerpt}}
                 <div class="topic-excerpt">
                   {{{t.excerpt}}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
index 44ac3d68a..86c7c6213 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
@@ -21,8 +21,10 @@
             <div class='topic-inset'>
               {{topic-status topic=t}}
               {{topic-link t}}
+              {{#if t.unseen}}
+                <span class="badge-notification new-topic"></span>
+              {{/if}}
               <span class="{{cold-age-class t.last_posted_at}}" title='{{raw-date t.last_posted_at}}'>{{{format-age t.last_posted_at}}}</span>
-
               {{#if t.hasExcerpt}}
                 <div class="topic-excerpt">
                   {{{t.excerpt}}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs
index 7e61ac956..0c1190703 100644
--- a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.raw.hbs
@@ -10,6 +10,9 @@
     <div class='main-link'>
       {{raw "topic-status" topic=content}}
       {{topic-link content}}
+      {{#if content.unseen}}
+        <span class="badge-notification new-topic"></span>
+      {{/if}}
       {{raw "list/topic-excerpt" topic=content}}
     </div>
 
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index c7340dcdc..7f70b260f 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -92,8 +92,8 @@
       margin-right: 0;
     }
     &.new-topic {
-      padding-right: 0;
-      top: -3px;
+      padding: 0;
+      top: -2px;
     }
   }