From 8c46ecf7f3b50778cf42db4e7c0d0aa40f049d8b Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 16 Aug 2018 00:02:26 -0400
Subject: [PATCH] UX: Improving tag topic list navigation consistency

---
 .../discourse/templates/tags/show.hbs         | 36 ++++++++++---------
 .../tag-notifications-button.js.es6           |  2 +-
 .../stylesheets/common/base/_topic-list.scss  |  4 +++
 .../stylesheets/common/base/tagging.scss      | 14 ++++----
 .../stylesheets/desktop/topic-list.scss       |  2 +-
 5 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/tags/show.hbs b/app/assets/javascripts/discourse/templates/tags/show.hbs
index 7d2f6578403..b5e601ac465 100644
--- a/app/assets/javascripts/discourse/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/show.hbs
@@ -5,23 +5,6 @@
 <div class="list-controls">
   <div class="container">
     <section class="navigation-container">
-    {{#if tagNotification}}
-      {{#unless additionalTags}}
-        {{tag-notifications-button action="changeTagNotification"
-                                   notificationLevel=tagNotification.notification_level}}
-      {{/unless}}
-    {{/if}}
-
-      {{#if showAdminControls}}
-        {{d-button action="deleteTag" icon="trash-o" class="admin-tag btn-danger"}}
-        {{d-button action="renameTag" actionParam=tag icon="pencil" class="admin-tag"}}
-      {{/if}}
-
-    {{create-topic-button
-      canCreateTopic=canCreateTopic
-      disabled=createTopicDisabled
-      label=createTopicLabel
-      action=(route-action "createTopic")}}
 
     {{#if showTagFilter}}
       {{bread-crumbs categories=categories
@@ -41,6 +24,25 @@
         {{/each}}
       </h2>
     {{/if}}
+
+
+    {{#if tagNotification}}
+      {{#unless additionalTags}}
+        {{tag-notifications-button action="changeTagNotification"
+                                   notificationLevel=tagNotification.notification_level}}
+      {{/unless}}
+    {{/if}}
+
+    {{create-topic-button
+      canCreateTopic=canCreateTopic
+      disabled=createTopicDisabled
+      label=createTopicLabel
+      action=(route-action "createTopic")}}
+
+     {{#if showAdminControls}}
+        {{d-button action="renameTag" actionParam=tag icon="pencil" class="admin-tag"}}
+        {{d-button action="deleteTag" icon="trash-o" class="admin-tag btn-danger"}}
+      {{/if}}
     </section>
   </div>
 </div>
diff --git a/app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6 b/app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6
index 7208f8c81ab..3ec3e110b47 100644
--- a/app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6
+++ b/app/assets/javascripts/select-kit/components/tag-notifications-button.js.es6
@@ -18,6 +18,6 @@ export default NotificationOptionsComponent.extend({
 
   @computed("iconForSelectedDetails")
   headerIcon(iconForSelectedDetails) {
-    return [iconForSelectedDetails, "caret-down"];
+    return iconForSelectedDetails;
   }
 });
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index addd06fe53d..e365fbabf05 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -13,6 +13,7 @@
 
 .list-controls {
   clear: both;
+  margin-bottom: 5px;
   .combo-box .combo-box-header {
     background: $primary-low;
     color: $primary;
@@ -35,6 +36,9 @@
     &.category-notifications-button,
     &.tag-notifications-button {
       float: right;
+      button {
+        display: inline-block;
+      }
     }
   }
 }
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index 5ea0ac6c8e1..d29c03466ee 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -29,6 +29,14 @@
   }
 }
 
+.tag-show-heading {
+  display: inline-flex;
+  align-items: center;
+  .d-icon {
+    margin: 0 0.25em;
+  }
+}
+
 .topic-header-extra .discourse-tag {
   -webkit-animation: fadein 0.7s;
   animation: fadein 0.7s;
@@ -201,12 +209,6 @@ header .discourse-tag {
   width: 500px;
 }
 
-.admin-tag {
-  position: relative;
-  float: right;
-  margin-right: 8px;
-}
-
 .tag-sort-options {
   margin-bottom: 20px;
   a {
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 6f1554aad5d..f34af5b31c0 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -8,7 +8,7 @@
 .list-controls {
   .nav {
     float: left;
-    margin-bottom: 15px;
+    margin-bottom: 10px;
   }
 
   .btn {