Merge branch 'master' into chats-redesign

less/categories.less

@@ -27,12 +27,13 @@
 				height: 46px;
 			}
 
-			h1 {
+			h2 {
 				font-size: 20px;
 				line-height: 22px;
 				margin: 0;
 				margin-left: 62px;
 				width: 85%;
+				word-break: break-all;
 
 				strong {
 					color: @gray-dark;
@@ -45,7 +46,7 @@
 					height: 32px;
 					margin-right: 8px;
 				}
-				h1 {
+				h2 {
 					margin-left: 40px;
 				}
 			}

less/category.less

@@ -8,7 +8,7 @@
 					border-color: lighten(@gray-light, 20%) !important;
 				}
 
-				h1 a {
+				h2 a {
 					color: @gray !important;
 				}
 			}
@@ -91,4 +91,20 @@
 		text-transform: uppercase;
 		color: @gray-light;
 	}
+
+	h2.title p {
+		font-size: 65%;
+		font-weight: normal;
+		line-height: 1;
+		color: @gray-light;
+	}
+}
+
+.categories-title {
+	text-transform: uppercase;
+	color: @gray-light;
+	margin: 0 0 10px;
+	font-size: 14px;
+	font-weight: normal;
+	line-height: 1.42857143;
 }

less/header.less

@@ -1,12 +1,11 @@
 #menu, .header {
-	#notif-list {
+	.notification-list {
 		overflow-x: hidden;
 		overflow-y: auto;
 		max-height: 250px;
 		padding: 0;
 
 		li {
-			font-size: 12px;
 			width: 300px;
 			text-align: left;
 			margin-bottom: 5px;
@@ -75,12 +74,11 @@
 	}
 	
 	.chat-list {
-		#notif-list;
+		.notification-list;
 
 		li {
 			.pointer;
 			width: 200px;
-			font-size: 16px;
 
 			a {
 				white-space: nowrap;

less/mobile.less

@@ -2,18 +2,11 @@
 	display: none;
 }
 
-@media (max-width: 980px) {
-	html {
-		height: 100%;
-		overflow-y: hidden;
-	}
 
+@media (max-width: 980px) {
 	body {
-		height: 100%;
 		padding-top: 0;
 		padding-bottom: 0;
-		overflow-y: scroll;
-		overflow-x: hidden;
 	}
 
 	#panel {

less/topic.less

@@ -2,6 +2,7 @@
 	h1 {
 		line-height: 24px;
 		margin-bottom: 30px;
+		word-break: break-all;
 		
 		.topic-title {
 			font-size: 28px;

lib/persona.js

@@ -196,7 +196,7 @@ $(document).ready(function() {
 			$('#menu').show();
 
 			$('#header-menu').css({
-				'top': $('#panel').position().top * -1 + 'px',
+				'top': $(window).scrollTop() + 'px',
 				'position': 'absolute'
 			});
 		}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "2.1.11",
+  "version": "2.1.17",
   "nbbpm": {
     "compatibility": "^0.8.0"
   },

templates/account/edit.tpl

@@ -113,7 +113,7 @@
 					<div class="input-group">
 						<input class="form-control" type="password" id="inputNewPassword" placeholder="[[user:password]]" value="">
 						<span class="input-group-addon">
-							<span id="password-notify"><span class="msg"></span><i class="fa fa-circle-o"></i></span>
+							<span id="password-notify"><span class="success hide"><i class="fa fa-check"></i></span><span class="error hide"></span><span class="default"><i class="fa fa-circle-o"></i></span></span>
 						</span>
 					</div>
 				</div>
@@ -123,7 +123,7 @@
 					<div class="input-group">
 						<input class="form-control" type="password" id="inputNewPasswordAgain" placeholder="[[user:confirm_password]]" value="">
 						<span class="input-group-addon">
-							<span id="password-confirm-notify"><span class="msg"></span><i class="fa fa-circle-o"></i></span>
+							<span id="password-confirm-notify"><span class="success hide"><i class="fa fa-check"></i></span><span class="error hide"></span><span class="default"><i class="fa fa-circle-o"></i></span></span>
 						</span>
 					</div>
 				</div>

templates/categories.tpl

@@ -1,6 +1,5 @@
+<h1 class="categories-title">[[category:categories]]</h1>
 <ul class="categories" itemscope itemtype="http://www.schema.org/ItemList">
-	<p>[[category:categories]]</p>
-
 	<!-- BEGIN categories -->
 	<!-- IMPORT partials/categories/item.tpl -->
 	<!-- END categories -->

templates/header.tpl

@@ -60,7 +60,7 @@
 				[[global:header.notifications]]
 				<span class="counter" component="notifications/icon" data-content="0"></span>
 			</h3>
-			<ul class="menu-section-list"></ul>
+			<ul class="menu-section-list" component="notifications/list"></ul>
 		</section>
 
 		<section class="menu-section" data-section="chats">

templates/login.tpl

@@ -6,7 +6,7 @@
 		<div class="well well-lg">
 			<div class="alert alert-danger" id="login-error-notify" <!-- IF error -->style="display:block"<!-- ELSE -->style="display: none;"<!-- ENDIF error -->>
 				<button type="button" class="close" data-dismiss="alert">&times;</button>
-				<strong>[[login:failed_login_attempt]]</strong>
+				[[login:failed_login_attempt]]
 				<p>{error}</p>
 			</div>
 

templates/partials/categories/item.tpl

@@ -6,10 +6,10 @@
 			<i class="fa fa-fw {../icon}"></i>
 		</div>
 
-		<h1 class="title">
+		<h2 class="title">
 			<!-- IMPORT partials/categories/link.tpl --><br />
-			<small>{../descriptionParsed}</small>
+			{../descriptionParsed}
-		</h1>
+		</h2>
 	</div>
 
 	<!-- IF !../link -->

templates/partials/menu.tpl

@@ -70,7 +70,7 @@
 						</a>
 						<ul class="dropdown-menu" aria-labelledby="notif_dropdown">
 							<li>
-								<ul id="notif-list">
+								<ul component="notifications/list" class="notification-list">
 									<li>
 										<a href="#"><i class="fa fa-refresh fa-spin"></i> [[global:notifications.loading]]</a>
 									</li>
@@ -101,14 +101,14 @@
 				</ul>
 				<!-- ELSE -->
 				<ul id="logged-out-menu" class="nav navbar-nav navbar-right">
-					<!-- IF config.allowRegistration -->
+					<!-- IF allowRegistration -->
 					<li>
 						<a href="{relative_path}/register">
 							<i class="fa fa-pencil visible-xs-inline"></i>
 							<span>[[global:register]]</span>
 						</a>
 					</li>
-					<!-- ENDIF config.allowRegistration -->
+					<!-- ENDIF allowRegistration -->
 					<li>
 						<a href="{relative_path}/login">
 							<i class="fa fa-sign-in visible-xs-inline"></i>

templates/partials/notifications_list.tpl

@@ -14,7 +14,7 @@
 	<!-- ENDIF notifications.image -->
 
 	<div class="pull-right mark-read" aria-label="Mark Read"></div>
-	<a href="{notifications.path}">
+	<a href="{config.relative_path}{notifications.path}">
 		<span class="pull-right relTime">{notifications.timeago}</span>
 		<span class="text">{notifications.bodyShort}</span>
 	</a>

templates/partials/topics_list.tpl

@@ -18,7 +18,7 @@
 				<!-- ENDIF showSelect -->
 			</div>
 
-			<h1 component="topic/header" class="title">
+			<h2 component="topic/header" class="title">
 				<i component="topic/pinned" class="fa fa-thumb-tack <!-- IF !topics.pinned -->hide<!-- ENDIF !topics.pinned -->"></i>
 				<i component="topic/locked" class="fa fa-lock <!-- IF !topics.locked -->hide<!-- ENDIF !topics.locked -->"></i>
 				<a href="{config.relative_path}/topic/{topics.slug}" itemprop="url">{topics.title}</a><br />
@@ -37,7 +37,7 @@
 				</span>
 
 				<small>[[global:posted_ago, <span class="timeago" title="{topics.relativeTime}"></span>]]</small>
-			</h1>
+			</h2>
 		</div>
 
 		<div class="col-md-1 hidden-sm hidden-xs stats">

templates/popular.tpl

@@ -12,9 +12,7 @@
 
 	<div class="category">
 		<!-- IF !topics.length -->
-		<div class="alert alert-warning" id="category-no-topics">
+		<div class="alert alert-warning" id="category-no-topics">[[recent:no_popular_topics]]</div>
-			<strong>[[recent:no_popular_topics]]</strong>
-		</div>
 		<!-- ENDIF !topics.length -->
 
 		<!-- IMPORT partials/topics_list.tpl -->

templates/recent.tpl

@@ -17,9 +17,7 @@
 
 	<div class="category">
 		<!-- IF !topics.length -->
-		<div class="alert alert-warning" id="category-no-topics">
+		<div class="alert alert-warning" id="category-no-topics">[[recent:no_recent_topics]]</div>
-			<strong>[[recent:no_recent_topics]]</strong>
-		</div>
 		<!-- ENDIF !topics.length -->
 
 		<a href="{config.relative_path}/recent">

templates/register.tpl

@@ -5,7 +5,7 @@
 		<div class="well well-lg">
 			<div class="alert alert-danger" id="register-error-notify" <!-- IF error -->style="display:block"<!-- ELSE -->style="display: none;"<!-- ENDIF error -->>
 				<button type="button" class="close" data-dismiss="alert">&times;</button>
-				<strong>[[error:registration-error]]</strong>
+				[[error:registration-error]]
 				<p>{error}</p>
 			</div>
 			<form class="form-horizontal" role="form" action="{config.relative_path}/register" method="post">

templates/reset.tpl

@@ -8,11 +8,11 @@
 <div class="well">
 	<div class="alert alert-success hidden" id="success">
 		<button type="button" class="close" data-dismiss="alert">&times;</button>
-		<strong>[[reset_password:password_reset_sent]]</strong>
+		[[reset_password:password_reset_sent]]
 	</div>
 	<div class="alert alert-danger hidden" id="error">
 		<button type="button" class="close" data-dismiss="alert">&times;</button>
-		<strong>[[reset_password:invalid_email]]</strong>
+		[[reset_password:invalid_email]]
 	</div>
 	<form onsubmit="return false;">
 		<input type="text" class="form-control input-block input-lg" placeholder="[[reset_password:enter_email_address]]" id="email" />

templates/tag.tpl

@@ -2,9 +2,7 @@
 	<!-- IMPORT partials/breadcrumbs.tpl -->
 
 	<!-- IF !topics.length -->
-	<div class="alert alert-warning">
+	<div class="alert alert-warning">[[tags:no_tag_topics]]</div>
-		<strong>[[tags:no_tag_topics]]</strong>
-	</div>
 	<!-- ENDIF !topics.length -->
 
 	<div class="category">

templates/tags.tpl

@@ -2,9 +2,7 @@
 	<!-- IMPORT partials/breadcrumbs.tpl -->
 
 	<!-- IF !tags.length -->
-	<div class="alert alert-warning">
+	<div class="alert alert-warning">[[tags:no_tags]]</div>
-		<strong>[[tags:no_tags]]</strong>
-	</div>
 	<!-- ENDIF !tags.length -->
 
 	<input class="form-control" type="text" id="tag-search" placeholder="[[global:search]]"/>

templates/unread.tpl

@@ -48,9 +48,7 @@
 	<hr />
 
 	<div class="category">
-		<div id="category-no-topics" class="alert alert-warning <!-- IF topics.length -->hidden<!-- ENDIF topics.length -->">
+		<div id="category-no-topics" class="alert alert-warning <!-- IF topics.length -->hidden<!-- ENDIF topics.length -->">[[unread:no_unread_topics]]</div>
-			<strong>[[unread:no_unread_topics]]</strong>
-		</div>
 
 		<a href="{config.relative_path}/unread">
 			<div class="alert alert-warning hide" id="new-topics-alert"></div>