fix: hide expando button if no subcategories; remove attempt at estab…

…lishing common vars, increased spacing between categories in list
NodeBB · Jul 25, 2022 · 89c11a1 · 89c11a1
1 parent 741e8c8
commit 89c11a1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/public/less/admin/manage/categories.less b/public/less/admin/manage/categories.less
@@ -22,7 +22,7 @@ div.categories {
 			}
 		}
 		> li {
-			margin: @acp-base-line 0;
+			margin: 16px 0 24px 0;
 
 			&.placeholder {
 				border: 1px dashed #2196F3;
@@ -37,7 +37,7 @@ div.categories {
 		li {
 			min-height: 0;
 			display: inline;
-			margin: 0 @acp-margin 0 0;
+			margin: 0 16px 0 0;
 			left: 0;
 		}
 	}
@@ -93,7 +93,7 @@ div.categories {
 
 	.category-header {
 		margin-top: 0;
-		margin-bottom: @acp-base-line;
+		margin-bottom: 8px;
 	}
 
 	.description {

diff --git a/public/less/admin/vars.less b/public/less/admin/vars.less
@@ -1,6 +1,3 @@
-@acp-base-line: 8px;
-@acp-line-height: @acp-base-line * 6;
-@acp-margin: @acp-base-line * 2;
 // system font family
 // based on those in [bootstrap@5.0.0-alpha1](https://github.com/twbs/bootstrap/blob/b531bda07cbea2e124194aefe3b8597b3ac2578e/scss/_variables.scss#L386)
 // and [wordpress admin](https://core.trac.wordpress.org/browser/trunk/src/wp-admin/css/common.css?rev=47835#L220)

diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js
@@ -251,6 +251,12 @@ define('admin/manage/categories', [
 			}, function (html) {
 				container.append(html);
 
+				// Disable expand toggle
+				if (!categories.length) {
+					const toggleEl = container.get(0).querySelector('.toggle');
+					toggleEl.remove();
+				}
+
 				// Handle and children categories in this level have
 				for (let x = 0, numCategories = categories.length; x < numCategories; x += 1) {
 					renderList(categories[x].children, $('li[data-cid="' + categories[x].cid + '"]'), categories[x]);