From 998a7818ae05984e644f995c9f3d14f1ed44a13f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Wed, 23 Sep 2020 01:01:23 -0400
Subject: [PATCH 1/2] feat: topic page changes

---
 less/category.less                 | 11 -----------
 less/tags.less                     | 11 +++++++++++
 less/topic.less                    | 26 +++++++++++++++++++-------
 templates/partials/post_bar.tpl    |  5 -----
 templates/partials/topic/stats.tpl | 16 ++++++++++------
 templates/partials/topic/tags.tpl  |  3 +--
 templates/topic.tpl                | 24 ++++++++++++++++++++----
 7 files changed, 61 insertions(+), 35 deletions(-)

diff --git a/less/category.less b/less/category.less
index f183aeb..7966e6c 100644
--- a/less/category.less
+++ b/less/category.less
@@ -87,17 +87,6 @@
 				}
 			}
 
-			.tag-list {
-				display: inline-block;
-				.tag {
-					text-transform: uppercase;
-					font-size: 10px;
-					background: lighten(@gray-lighter, 2.5%);
-					padding: 5px;
-					white-space: nowrap;
-				}
-			}
-
 			.fa-stack {
 				font-size: 90%;
 				border-radius: 50%;
diff --git a/less/tags.less b/less/tags.less
index f85d2de..95a8622 100644
--- a/less/tags.less
+++ b/less/tags.less
@@ -23,4 +23,15 @@
 	font-weight: 700;
 	white-space: nowrap;
 	border-left: none;
+}
+
+.tag-list {
+	display: inline-block;
+	.tag {
+		text-transform: uppercase;
+		font-size: 10px;
+		background: lighten(@gray-lighter, 2.5%);
+		padding: 5px;
+		white-space: nowrap;
+	}
 }
\ No newline at end of file
diff --git a/less/topic.less b/less/topic.less
index 54c5880..04eb69c 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -5,7 +5,7 @@
 
 	h1 {
 		line-height: 40px;
-		margin-bottom: 30px;
+		margin-bottom: 10px;
 
 		.topic-title {
 			word-wrap: break-word;
@@ -31,6 +31,22 @@
 			text-transform: initial;
 		}
 	}
+	.topic-info {
+		border-bottom: 1px solid @post-border-color;
+		margin-bottom: 10px;
+    	padding-bottom: 10px;
+	}
+	.category-item {
+		.icon {
+			min-width: 23px;
+    		min-height: 23px;
+    		font-size: 10px;
+    		line-height: 12px;
+    		padding: 5px;
+			margin-right: 5px;
+			border-radius: 50%;
+		}
+	}
 
 	.posts {
 		h1:first-child, h2:first-child, h3:first-child, h4:first-child, h5:first-child, h6:first-child {
@@ -202,7 +218,8 @@
 	}
 
 	.stats {
-		margin: 0px 10px 0px 10px;
+		font-size: 12px;
+		margin: 0px 5px 0px 5px;
 		float: left;
 	}
 
@@ -257,11 +274,6 @@
 		}
 	}
 
-	.tags {
-		vertical-align: -40%;
-		margin-bottom: @post-padding;
-	}
-
 	h1 {
 		.btn-group, .btn {
 			margin-left: 15px;
diff --git a/templates/partials/post_bar.tpl b/templates/partials/post_bar.tpl
index 8543967..1abefc2 100644
--- a/templates/partials/post_bar.tpl
+++ b/templates/partials/post_bar.tpl
@@ -1,7 +1,4 @@
 <div class="clearfix">
-	<div class="tags pull-left">
-		<!-- IMPORT partials/topic/tags.tpl -->
-	</div>
 
 	<!-- IMPORT partials/topic/browsing-users.tpl -->
 
@@ -10,8 +7,6 @@
 			<span class="hidden-xs">[[topic:loading_more_posts]]</span> <i class="fa fa-refresh fa-spin"></i>
 		</span>
 
-		<!-- IMPORT partials/topic/stats.tpl -->
-
 		<!-- IMPORT partials/topic/reply-button.tpl -->
 
 		<!-- IF loggedIn -->
diff --git a/templates/partials/topic/stats.tpl b/templates/partials/topic/stats.tpl
index 37eadc9..7cd47d0 100644
--- a/templates/partials/topic/stats.tpl
+++ b/templates/partials/topic/stats.tpl
@@ -1,8 +1,12 @@
-<div class="stats hidden-xs">
-	<span component="topic/post-count" class="human-readable-number" title="{postcount}">{postcount}</span><br />
-	<small>[[global:posts]]</small>
+<div class="stats hidden-xs text-muted">
+	<i class="fa fa-fw fa-user" title="[[global:posters]]"></i>
+	<span title="{posterCount}" class="human-readable-number">{posterCount}</span>
 </div>
-<div class="stats hidden-xs">
-	<span class="human-readable-number" title="{viewcount}">{viewcount}</span><br />
-	<small>[[global:views]]</small>
+<div class="stats hidden-xs text-muted">
+	<i class="fa fa-fw fa-pencil" title="[[global:posts]]"></i>
+	<span component="topic/post-count" title="{postcount}" class="human-readable-number">{postcount}</span>
+</div>
+<div class="stats hidden-xs text-muted">
+	<i class="fa fa-fw fa-eye" title="[[global:views]]"></i>
+	<span class="human-readable-number" title="{viewcount}">{viewcount}</span>
 </div>
\ No newline at end of file
diff --git a/templates/partials/topic/tags.tpl b/templates/partials/topic/tags.tpl
index 79a7b7d..d8e81ae 100644
--- a/templates/partials/topic/tags.tpl
+++ b/templates/partials/topic/tags.tpl
@@ -1,6 +1,5 @@
 {{{each tags}}}
 <a href="{config.relative_path}/tags/{tags.value}">
-    <span class="tag-item" data-tag="{tags.value}" style="<!-- IF tags.color -->color: {tags.color};<!-- ENDIF tags.color --><!-- IF tags.bgColor -->background-color: {tags.bgColor};<!-- ENDIF tags.bgColor -->">{tags.valueEscaped}</span>
-    <span class="tag-topic-count human-readable-number" title="{tags.score}">{tags.score}</span>
+    <span class="tag tag-item" data-tag="{tags.value}" style="<!-- IF tags.color -->color: {tags.color};<!-- ENDIF tags.color --><!-- IF tags.bgColor -->background-color: {tags.bgColor};<!-- ENDIF tags.bgColor -->">{tags.valueEscaped}</span>
 </a>
 {{{end}}}
\ No newline at end of file
diff --git a/templates/topic.tpl b/templates/topic.tpl
index 6e6df24..778bbec 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -8,15 +8,33 @@
 	<div class="topic <!-- IF widgets.sidebar.length -->col-lg-9 col-sm-12<!-- ELSE -->col-lg-12<!-- ENDIF widgets.sidebar.length -->">
 
 		<h1 component="post/header" class="hidden-xs" itemprop="name">
-
 			<i component="topic/pinned" class="pull-left fa fa-thumb-tack <!-- IF !pinned -->hidden<!-- ENDIF !pinned -->" title="[[topic:pinned]]"></i>
 			<i component="topic/locked" class="pull-left fa fa-lock <!-- IF !locked -->hidden<!-- ENDIF !locked -->" title="[[topic:locked]]"></i>
 			<i class="pull-left fa fa-arrow-circle-right <!-- IF !oldCid -->hidden<!-- ENDIF !oldCid -->" title="[[topic:moved]]"></i>
 			{{{each icons}}}@value{{{end}}}
-
 			<span class="topic-title" component="topic/title">{title}</span>
 		</h1>
 
+		<div class="topic-info clearfix">
+			<div class="category-item inline-block">
+				{{{ if category.icon }}}
+				<div role="presentation" class="icon pull-left" style="{{{ if category.bgColor }}}background-color: {category.bgColor};{{{end}}}; {{{ if category.color}}}color: {category.color};{{{end}}}">
+					<i class="fa fa-fw {category.icon}"></i>
+				</div>
+				{{{ end }}}
+				<a href="{config.relative_path}/category/{category.slug}">{category.name}</a>
+			</div>
+			{{{ if tags.length }}}
+			&bull;
+			{{{ end}}}
+			<div class="tags tag-list inline-block">
+				<!-- IMPORT partials/topic/tags.tpl -->
+			</div>
+			<div class="pull-right">
+				<!-- IMPORT partials/topic/stats.tpl -->
+			</div>
+		</div>
+
 		<!-- IF merger -->
 		<div component="topic/merged/message" class="alert alert-warning clearfix">
 			<span class="pull-left">[[topic:merged_message, {config.relative_path}/topic/{mergeIntoTid}, {merger.mergedIntoTitle}]]</span>
@@ -31,8 +49,6 @@
 
 		<!-- IMPORT partials/topic/deleted-message.tpl -->
 
-		<hr class="visible-xs" />
-
 		<ul component="topic" class="posts" data-tid="{tid}" data-cid="{cid}">
 			{{{each posts}}}
 				<li component="post" class="<!-- IF posts.deleted -->deleted<!-- ENDIF posts.deleted -->" <!-- IMPORT partials/data/topic.tpl -->>

From 414dbba7af1f2fc30f1a513e5ace163a7b65a02d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Wed, 23 Sep 2020 01:01:38 -0400
Subject: [PATCH 2/2] 10.2.32

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 887edb6..e4c4bb8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "10.2.31",
+  "version": "10.2.32",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 21ab86c..d7929dc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "10.2.31",
+  "version": "10.2.32",
   "nbbpm": {
     "compatibility": "^1.14.0"
   },