Merge branch 'master' into develop

less/categories.less

@@ -109,8 +109,16 @@
 		}
 
 		.category-children {
-			.fa-stack {
+			.category-children-item {
-				font-size: 65%;
+				margin-right: 10px;
+			}
+			.icon {
+				min-width: 23px;
+				min-height: 23px;
+				font-size: 10px;
+				line-height: 12px;
+				padding: 5px;
+				margin-right: 5px;
 			}
 		}
 	}

less/header.less

@@ -242,6 +242,10 @@
 			margin-left: -30px;
 		}
 	}
+
+	@media (min-width: @screen-md-min) {
+		top: 0px !important;
+	}
 }
 
 .breadcrumb {
@@ -296,7 +300,6 @@
 }
 
 .unread-count:after {
-	content: attr(data-content);
 	position: absolute;
 	left: 23px;
 	top: 10px;
@@ -314,6 +317,10 @@
 	font-family: @font-family-sans-serif;
 }
 
+.unread-count[data-content]:not([data-content=""]):not([data-content="0"]):after {
+	content: attr(data-content);
+}
+
 .slideout-menu .unread-count:after {
 	position: relative;
 	left: -6px;

less/modules/taskbar.less

@@ -138,8 +138,9 @@
 	}
 
 	@media (max-width: @screen-sm) {
-		.nav.navbar-nav {
+		/*
-			margin: 0;
+			Gets in the way of entering text when writing posts
-		}
+		*/
+		display: none !important;
 	}
 }

lib/persona.js

@@ -3,19 +3,15 @@
 /*globals ajaxify, config, utils, app, socket, NProgress*/
 
 $(document).ready(function() {
-	var env = utils.findBootstrapEnvironment();
-
 	setupNProgress();
 	setupTaskbar();
 	setupEditedByIcon();
 	setupMobileMenu();
 	setupQuickReply();
 
-	if (env === 'xs' || env ==='sm') {
+	$(".navbar-fixed-top").autoHidingNavbar({
-		$(".navbar-fixed-top").autoHidingNavbar({
+		showOnBottom: false
-			showOnBottom: false
+	});
-		});
-	}
 
 	function setupNProgress() {
 		$(window).on('action:ajaxify.start', function() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "7.2.7",
+  "version": "7.2.10",
   "nbbpm": {
     "compatibility": "^1.7.0"
   },
@@ -39,7 +39,7 @@
     "url": "https://github.com/psychobunny/nodebb-theme-persona/issues"
   },
   "dependencies": {
-    "striptags": "^3.1.0",
+    "striptags": "^3.1.1",
-    "pulling": "^1.1.0"
+    "pulling": "^1.1.1"
   }
 }

templates/header.tpl

@@ -20,7 +20,7 @@
 	{{customHTML}}
 	<!-- END -->
 	<!-- IF useCustomCSS -->
-	<style type="text/css">{{customCSS}}</style>
+	<style>{{customCSS}}</style>
 	<!-- END -->
 </head>
 
@@ -51,7 +51,7 @@
 		<section class="menu-section" data-section="notifications">
 			<h3 class="menu-section-title">
 				[[global:header.notifications]]
-				<span class="counter" component="notifications/icon" data-content="0"></span>
+				<span class="counter unread-count" component="notifications/icon" data-content="{unreadCount.notification}"></span>
 			</h3>
 			<ul class="menu-section-list notification-list-mobile" component="notifications/list"></ul>
 			<p class="menu-section-list"><a href="{relative_path}/notifications">[[notifications:see_all]]</a></p>
@@ -63,7 +63,7 @@
 		<section class="menu-section" data-section="chats">
 			<h3 class="menu-section-title">
 				[[global:header.chats]]
-				<i class="counter" component="chat/icon" data-content="0"></i>
+				<i class="counter unread-count" component="chat/icon" data-content="{unreadCount.chat}"></i>
 			</h3>
 			<ul class="menu-section-list chat-list" component="chat/list"></ul>
 		</section>

templates/partials/menu.tpl

@@ -1,10 +1,10 @@
 			<div class="navbar-header">
 				<button type="button" class="navbar-toggle pull-left" id="mobile-menu">
-					<span component="notifications/icon" class="notification-icon fa fa-fw fa-bell-o" data-content="0"></span>
+					<span component="notifications/icon" class="notification-icon fa fa-fw fa-bell-o unread-count" data-content="{unreadCount.notification}"></span>
 					<i class="fa fa-lg fa-bars"></i>
 				</button>
 				<button type="button" class="navbar-toggle hidden" id="mobile-chats">
-					<span component="chat/icon" class="notification-icon fa fa-fw fa-comments" data-content="0"></span>
+					<span component="chat/icon" class="notification-icon fa fa-fw fa-comments unread-count" data-content="{unreadCount.chat}"></span>
 					<i class="fa fa-lg fa-comment-o"></i>
 				</button>
 
@@ -31,7 +31,7 @@
 				<ul id="logged-in-menu" class="nav navbar-nav navbar-right">
 					<li class="notifications dropdown text-center hidden-xs" component="notifications">
 						<a href="{relative_path}/notifications" title="[[global:header.notifications]]" class="dropdown-toggle" data-toggle="dropdown" id="notif_dropdown" data-ajaxify="false" role="button">
-							<i component="notifications/icon" class="fa fa-fw fa-bell-o" data-content="0"></i>
+							<i component="notifications/icon" class="fa fa-fw fa-bell-o unread-count" data-content="{unreadCount.notification}"></i>
 						</a>
 						<ul class="dropdown-menu" aria-labelledby="notif_dropdown">
 							<li>
@@ -49,7 +49,7 @@
 					<!-- IF !config.disableChat -->
 					<li class="chats dropdown">
 						<a class="dropdown-toggle" data-toggle="dropdown" href="{relative_path}/user/{user.userslug}/chats" title="[[global:header.chats]]" id="chat_dropdown" component="chat/dropdown" data-ajaxify="false" role="button">
-							<i component="chat/icon" class="fa fa-comment-o fa-fw"></i> <span class="visible-xs-inline">[[global:header.chats]]</span>
+							<i component="chat/icon" class="fa fa-comment-o fa-fw unread-count" data-content="{unreadCount.chat}"></i> <span class="visible-xs-inline">[[global:header.chats]]</span>
 						</a>
 						<ul class="dropdown-menu" aria-labelledby="chat_dropdown">
 							<li>
@@ -226,7 +226,7 @@
 					<li class="{navigation.class}">
 						<a class="navigation-link" href="{navigation.route}" title="{navigation.title}" <!-- IF navigation.id -->id="{navigation.id}"<!-- ENDIF navigation.id --><!-- IF navigation.properties.targetBlank --> target="_blank"<!-- ENDIF navigation.properties.targetBlank -->>
 							<!-- IF navigation.iconClass -->
-							<i class="fa fa-fw {navigation.iconClass}"></i>
+							<i class="fa fa-fw {navigation.iconClass}" data-content="{navigation.content}"></i>
 							<!-- ENDIF navigation.iconClass -->
 
 							<!-- IF navigation.text -->

templates/partials/topics_list.tpl

@@ -51,7 +51,7 @@
 
 				<!-- IF !template.category -->
 				<small>
-					<a href="{config.relative_path}/category/{topics.category.slug}"><span class="fa-stack fa-lg"><i style="color:{topics.category.bgColor};"class="fa fa-circle fa-stack-2x"></i><i style="color:{topics.category.color};" class="fa {topics.category.icon} fa-stack-1x"></i></span> {topics.category.name}</a> &bull;
+					<a href="{config.relative_path}/category/{topics.category.slug}"><span class="fa-stack fa-lg"><i style="color:{topics.category.bgColor};" class="fa fa-circle fa-stack-2x"></i><i style="color:{topics.category.color};" class="fa {topics.category.icon} fa-stack-1x"></i></span> {topics.category.name}</a> &bull;
 				</small>
 				<!-- ENDIF !template.category -->