From 3457395f75df04e473f5ba46b3b842c9bb21f2e2 Mon Sep 17 00:00:00 2001
From: Joe <33972521+hnb-ku@users.noreply.github.com>
Date: Tue, 8 Jan 2019 14:55:15 +0800
Subject: [PATCH] UX: moves topic-list excerpts out of category / tag div

---
 .../templates/list/topic-list-item.raw.hbs    | 44 +++++++++----------
 .../stylesheets/common/base/_topic-list.scss  |  3 --
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
index d0b1077dd46..095518f07aa 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
@@ -17,25 +17,25 @@
     {{~raw "topic-status" topic=topic}}
     {{~topic-link topic class="raw-link raw-topic-link"}}
     {{~#if topic.featured_link}}
-      {{~topic-featured-link topic}}
+    {{~topic-featured-link topic}}
     {{~/if}}
     {{~raw-plugin-outlet name="topic-list-after-title"}}
     {{~#if showTopicPostBadges}}
-      {{~raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl newDotText=newDotText}}
+    {{~raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl newDotText=newDotText}}
     {{~/if}}
   </span>
   <div class="link-bottom-line">
-  {{#unless hideCategory}}
-    {{#unless topic.isPinnedUncategorized}}
-      {{category-link topic.category}}
+    {{#unless hideCategory}}
+      {{#unless topic.isPinnedUncategorized}}
+        {{category-link topic.category}}
+      {{/unless}}
     {{/unless}}
-  {{/unless}}
-  {{discourse-tags topic mode="list" tagsForUser=tagsForUser}}
+    {{discourse-tags topic mode="list" tagsForUser=tagsForUser}}
+    {{raw "list/action-list" topic=topic postNumbers=topic.liked_post_numbers className="likes" icon="heart"}}
+  </div>
   {{#if expandPinned}}
     {{raw "list/topic-excerpt" topic=topic}}
   {{/if}}
-  {{raw "list/action-list" topic=topic postNumbers=topic.liked_post_numbers className="likes" icon="heart"}}
-  </div>
 </td>
 
 {{#if showPosters}}
@@ -49,23 +49,23 @@
 {{/if}}
 
 {{#if showLikes}}
-<td class="num likes">
-  {{#if hasLikes}}
-    <a href='{{topic.summaryUrl}}'>
-      {{number topic.like_count}} {{d-icon "heart"}}</td>
-    </a>
-  {{/if}}
+  <td class="num likes">
+    {{#if hasLikes}}
+      <a href='{{topic.summaryUrl}}'>
+        {{number topic.like_count}} {{d-icon "heart"}}</td>
+  </a>
+{{/if}}
 {{/if}}
 
 {{#if showOpLikes}}
-<td class="num likes">
-  {{#if hasOpLikes}}
-    <a href='{{topic.summaryUrl}}'>
-      {{number topic.op_like_count}} {{d-icon "heart"}}</td>
-    </a>
-  {{/if}}
+  <td class="num likes">
+    {{#if hasOpLikes}}
+      <a href='{{topic.summaryUrl}}'>
+        {{number topic.op_like_count}} {{d-icon "heart"}}</td>
+  </a>
+{{/if}}
 {{/if}}
 
 <td class="num views {{topic.viewsHeat}}">{{number topic.views numberKey="views_long"}}</td>
 
-{{raw "list/activity-column" topic=topic class="num" tagName="td"}}
+{{raw "list/activity-column" topic=topic class="num" tagName="td"}}
\ No newline at end of file
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 63842ebcb6e..d276ea033c8 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -144,9 +144,6 @@
     .discourse-tag.box {
       margin-right: 0.25em;
     }
-    .topic-excerpt {
-      flex: 1 1 0%; // IE11 fix - unit on flexbasis is required
-    }
   }
 
   .topic-featured-link {