From e9360347ea276ee7646cdbdee6920e4790e52148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Sun, 9 Jul 2017 16:08:03 -0400
Subject: [PATCH] less padding, closes #5811

---
 public/less/admin/manage/categories.less      | 32 ++++++++++++++-----
 public/src/admin/manage/categories.js         |  6 ++++
 .../partials/categories/category-rows.tpl     | 12 ++++---
 3 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/public/less/admin/manage/categories.less b/public/less/admin/manage/categories.less
index c0c0a544dc..28eb9c7ff9 100644
--- a/public/less/admin/manage/categories.less
+++ b/public/less/admin/manage/categories.less
@@ -12,8 +12,6 @@ div.categories {
 		.row {
 			margin-left: -15px;
 			margin-right: -15px;
-			padding-bottom: 12px;
-			margin-bottom: 12px;
 		}
 
 		> li li:last-child {
@@ -37,7 +35,6 @@ div.categories {
 	li {
 		min-height: @acp-line-height;
 		margin: @acp-base-line 0;
-		margin-top: 28px;
 
 		&.placeholder {
 			border: 1px dashed #2196F3;
@@ -56,21 +53,40 @@ div.categories {
 		}
 	}
 
+	.toggle {
+		width: 24px;
+		height: 24px;
+		border-radius: 50%;
+		line-height: 24px;
+		text-align: center;
+		vertical-align: bottom;
+		background-size: cover;
+		float: left;
+		margin-right: 0px;
+		cursor: pointer;
+		.fa {
+			font-size: 85%;
+		}
+	}
+
 	.icon {
-		width: @acp-line-height;
-		height: @acp-line-height;
+		width: 24px;
+		height: 24px;
 		border-radius: 50%;
-		line-height: @acp-line-height;
+		line-height: 24px;
 		text-align: center;
 		vertical-align: bottom;
 		background-size: cover;
 		float: left;
-		margin-right: @acp-margin;
+		margin-right: 0px;
 		cursor: move;
+		.fa {
+			font-size: 85%;
+		}
 	}
 
 	.information {
-		padding-left: 70px;
+		padding-left: 60px;
 	}
 
 	.category-header {
diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js
index cb5d7e9975..2951481411 100644
--- a/public/src/admin/manage/categories.js
+++ b/public/src/admin/manage/categories.js
@@ -31,6 +31,12 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
 			Categories.toggle([cid].concat(children), !disabled);
 			return false;
 		});
+
+		$('.categories').on('click', '.toggle', function () {
+			var el = $(this);
+			el.find('i').toggleClass('fa-minus').toggleClass('fa-plus');
+			el.closest('[data-cid]').find('> ul[data-cid]').toggleClass('hidden');
+		});
 	};
 
 	Categories.throwCreateModal = function () {
diff --git a/src/views/admin/partials/categories/category-rows.tpl b/src/views/admin/partials/categories/category-rows.tpl
index 1ceeefb9d4..c4bfd008a5 100644
--- a/src/views/admin/partials/categories/category-rows.tpl
+++ b/src/views/admin/partials/categories/category-rows.tpl
@@ -4,8 +4,11 @@
         <div class="row">
             <div class="col-md-9">
                 <div class="clearfix">
+                    <div class="toggle">
+                        <i class="fa fa-minus"></i>
+                    </div>
                     <div class="icon" style="
-                        color: {categories.color}; 
+                        color: {categories.color};
                         background-color: {categories.bgColor};
                         <!-- IF categories.backgroundImage -->
                         background-image: url('{categories.backgroundImage}');
@@ -15,24 +18,23 @@
                     </div>
                     <div class="information">
                         <h5 class="category-header">{categories.name}</h5>
-                        <p class="description">{categories.descriptionParsed}</p>
                     </div>
                 </div>
             </div>
             <div class="col-md-3">
                 <div class="clearfix pull-right text-right">
                     <div class="btn-group">
-                        <button data-cid="{categories.cid}" data-action="toggle" data-disabled="{categories.disabled}" class="btn <!-- IF categories.disabled -->btn-primary<!-- ELSE -->btn-danger<!-- ENDIF categories.disabled -->">
+                        <button data-cid="{categories.cid}" data-action="toggle" data-disabled="{categories.disabled}" class="btn btn-sm <!-- IF categories.disabled -->btn-primary<!-- ELSE -->btn-danger<!-- ENDIF categories.disabled -->">
                             <!-- IF categories.disabled -->
                             [[admin/manage/categories:enable]]
                             <!-- ELSE -->
                             [[admin/manage/categories:disable]]
                             <!-- ENDIF categories.disabled -->
                         </button>
-                        <a href="./categories/{categories.cid}/analytics" class="btn btn-default">
+                        <a href="./categories/{categories.cid}/analytics" class="btn btn-default btn-sm">
                             <i class="fa fa-line-chart"></i>
                         </a>
-                        <a href="./categories/{categories.cid}" class="btn btn-default">
+                        <a href="./categories/{categories.cid}" class="btn btn-default btn-sm">
                             [[admin/manage/categories:edit]]
                         </a>
                     </div>