From ce75e30bf58e1318e650f19b3b5c4aefd26cedb9 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Mon, 25 Mar 2019 10:35:42 +0800
Subject: [PATCH] UX: Indent category badges to indicate sub-categories.

---
 .../discourse/templates/modal/reorder-categories.hbs | 12 +++++++-----
 app/assets/stylesheets/common/base/cat_reorder.scss  |  4 ++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
index 67b4456a234..9b8c114078e 100644
--- a/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/reorder-categories.hbs
@@ -2,16 +2,19 @@
   <div id="rc-scroll-anchor"></div>
   <table>
     <thead>
-    <th class="th-pos">{{i18n "categories.reorder.position"}}</th>
     <th class="th-cat">{{i18n "categories.category"}}</th>
+    <th class="th-pos">{{i18n "categories.reorder.position"}}</th>
     </thead>
     <tbody>
     {{#each categoriesOrdered as |cat|}}
       <tr data-category-id="{{cat.id}}">
         <td>
-          {{#if cat.parent_category_id}}
-            &nbsp;&nbsp;&nbsp;&nbsp;
-          {{/if}}
+          <div class={{if cat.parent_category_id 'reorder-categories-sub-cat' ''}}>
+            {{category-badge cat allowUncategorized="true"}}
+          </div>
+        </td>
+
+        <td>
           {{number-field number=(readonly cat.position) change=(action 'change' cat)}}
           {{d-button class="btn-default no-text" action=(action "moveUp") actionParam=cat icon="arrow-up"}}
           {{d-button class="btn-default no-text" action=(action "moveDown") actionParam=cat icon="arrow-down"}}
@@ -19,7 +22,6 @@
             {{d-button class="no-text ok" action=(action "commit") icon="check"}}
           {{/if}}
         </td>
-        <td>{{category-badge cat allowUncategorized="true"}}</td>
       </tr>
     {{/each}}
     </tbody>
diff --git a/app/assets/stylesheets/common/base/cat_reorder.scss b/app/assets/stylesheets/common/base/cat_reorder.scss
index 004bd621fe0..7aadd61dde3 100644
--- a/app/assets/stylesheets/common/base/cat_reorder.scss
+++ b/app/assets/stylesheets/common/base/cat_reorder.scss
@@ -27,3 +27,7 @@
     }
   }
 }
+
+.reorder-categories-sub-cat {
+  margin-left: 20px;
+}