Merge remote-tracking branch 'origin/master' into develop

less/header.less

@@ -175,6 +175,12 @@
 			pointer-events: inherit;
 		}
 
+		a {
+			display: inline-block;
+			padding-left: 2px;
+			padding-right: 2px;
+		}
+
 		.progress-container {
 			height: 2px;
 			position: absolute;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "4.2.2",
+  "version": "4.2.4",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

templates/partials/account/menu.tpl

@@ -6,11 +6,9 @@
 		<!-- IF !isSelf -->
 		<!-- IF !config.disableChat -->
 		<!-- IF !banned -->
-		<!-- IF hasPrivateChat -->
-		<li>
+		<li class="<!-- IF !hasPrivateChat -->hidden<!-- ENDIF !hasPrivateChat -->">
 			<a component="account/chat" href="#">[[user:chat_with, {username}]]</a>
 		</li>
-		<!-- ENDIF hasPrivateChat -->
 		<li>
 			<a component="account/new-chat" href="#">[[user:new_chat_with, {username}]]</a>
 		</li>

templates/partials/menu.tpl

@@ -179,15 +179,15 @@
 
 				<ul class="nav navbar-nav navbar-right pagination-block visible-lg visible-md">
 					<li class="dropdown">
-						<i class="fa fa-angle-double-up pointer fa-fw pagetop"></i>
-						<i class="fa fa-angle-up pointer fa-fw pageup"></i>
+						<a><i class="fa fa-angle-double-up pointer fa-fw pagetop"></i></a>
+						<a><i class="fa fa-angle-up pointer fa-fw pageup"></i></a>
 
 						<a href="#" class="dropdown-toggle" data-toggle="dropdown">
 							<span class="pagination-text"></span>
 						</a>
 
-						<i class="fa fa-angle-down pointer fa-fw pagedown"></i>
-						<i class="fa fa-angle-double-down pointer fa-fw pagebottom"></i>
+						<a><i class="fa fa-angle-down pointer fa-fw pagedown"></i></a>
+						<a><i class="fa fa-angle-double-down pointer fa-fw pagebottom"></i></a>
 
 						<div class="progress-container">
 							<div class="progress-bar"></div>

templates/partials/topics_list.tpl

@@ -1,7 +1,7 @@
 <ul component="category" class="topic-list" itemscope itemtype="http://www.schema.org/ItemList" data-nextstart="{nextStart}" data-set="{set}">
 	<meta itemprop="itemListOrder" content="descending">
 	<!-- BEGIN topics -->
-	<li component="category/topic" class="row clearfix {function.generateTopicClass}" <!-- IMPORT partials/data/category.tpl -->>
+	<li component="category/topic" class="row clearfix category-item {function.generateTopicClass}" <!-- IMPORT partials/data/category.tpl -->>
 		<meta itemprop="name" content="{function.stripTags, title}">
 
 		<div class="col-md-7 col-sm-9 col-xs-10 content">