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

less/rtl.less

@@ -97,4 +97,31 @@ html[data-dir="rtl"] {
 	.slideout-menu .chat-list li .teaser-content, .slideout-menu .chat-list li .room-name {
 		padding-right: 60px;
 	}
+
+	.posts-list .posts-list-item {
+		.post-body {
+			border-right: none;
+			border-left: 2px solid @brand-primary;
+		}
+
+		.post-info {
+			left: inherit;
+			right: 100%;
+
+			.post-author {
+				padding-left: 0;
+				padding-right: 25px;
+			}
+		}
+
+		.user-img {
+			margin-right: -14px;
+			margin-left: 0;
+		}
+
+		.content {
+			padding-right: 0;
+			padding-left: 10px;
+		}
+	}
 }

package.json

@@ -1,8 +1,8 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "7.2.23",
+  "version": "8.0.0",
   "nbbpm": {
-    "compatibility": "^1.7.0"
+    "compatibility": "^1.8.0"
   },
   "description": "Persona theme for NodeBB",
   "main": "theme.less",

templates/account/edit.tpl

@@ -111,7 +111,7 @@
 							</div>
 						</div>
 						<!-- ENDIF !disableSignatures -->
-						<!-- allowSignature -->
+						<!-- ENDIF allowSignature -->
 
 						<input type="hidden" id="inputUID" value="{uid}"><br />
 

templates/footer.tpl

@@ -1,6 +1,7 @@
+{isSpider}
 		</div><!-- END container -->
 	</main>
-
+	<!-- IF !isSpider -->
 	<div class="topic-search hidden">
 		<div class="btn-group">
 			<button type="button" class="btn btn-default count"></button>
@@ -15,6 +16,8 @@
 			<p>[[global:reconnecting-message, {config.siteTitle}]]</p>
 		</div>
 	</div>
+	<!-- ENDIF !isSpider -->
+
 
 	<script defer src="{relative_path}/assets/nodebb.min.js?{config.cache-buster}"></script>
 

templates/partials/menu.tpl

@@ -126,13 +126,11 @@
 									<i class="fa fa-fw fa-list-alt"></i> <span>[[pages:post-queue]]</span>
 								</a>
 							</li>
-							<!-- IF isAdmin -->
 							<li>
 								<a href="{relative_path}/ip-blacklist">
 									<i class="fa fa-fw fa-ban"></i> <span>[[pages:ip-blacklist]]</span>
 								</a>
 							</li>
-							<!-- ENDIF isAdmin -->
 							<!-- ENDIF showModMenu -->
 							<li role="presentation" class="divider"></li>
 							<li component="user/logout">

templates/topic.tpl

@@ -17,17 +17,17 @@
 			<span class="topic-title" component="topic/title">{title}</span>
 		</h1>
 
-		<div component="topic/merged/message" class="alert alert-warning<!-- IF !merger --> hidden<!-- ENDIF !merger --> clearfix">
+		<!-- IF merger -->
+		<div component="topic/merged/message" class="alert alert-warning clearfix">
 			<span class="pull-left">[[topic:merged_message, {mergeIntoTid}, {merger.mergedIntoTitle}]]</span>
 			<span class="pull-right">
-				<!-- IF merger -->
 				<a href="{config.relative_path}/user/{merger.userslug}">
 					<strong>{merger.username}</strong>
 				</a>
 				<small class="timeago" title="{mergedTimestampISO}"></small>
-				<!-- ENDIF merger -->
 			</span>
 		</div>
+		<!-- ENDIF merger -->
 
 		<div component="topic/deleted/message" class="alert alert-warning<!-- IF !deleted --> hidden<!-- ENDIF !deleted --> clearfix">
 			<span class="pull-left">[[topic:deleted_message]]</span>