Merge remote-tracking branch 'origin/master' into user-icons

less/chats.less

@@ -1,6 +1,5 @@
 .chats-list {
 	padding: 0;
-	max-height: 608px;
 	overflow-x: hidden;
 	overflow-y: auto;
 	border-top: 1px solid @gray-lighter;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.20",
+  "version": "3.0.23",
   "nbbpm": {
     "compatibility": "^0.9.0"
   },

templates/footer.tpl

@@ -4,7 +4,7 @@
 	<div class="hide tpl-500">
 	<!-- IMPORT 500.tpl -->
 	</div>
-	<!-- IMPORT partials/modals/upload_picture_modal.tpl -->
+
 
 	<div class="topic-search hidden">
 		<div class="btn-group">

templates/partials/fork_thread_modal.tpl

@@ -1,4 +1,4 @@
-<div id="fork-thread-modal" class="hide" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true" data-backdrop="none">
+<div id="fork-thread-modal" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true" data-backdrop="none">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">

templates/partials/modals/upload_picture_modal.tpl

@@ -29,6 +29,6 @@
 					<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
 					<button id="pictureUploadSubmitBtn" class="btn btn-primary">[[user:upload_picture]]</button>
 				</div>
-			</div><!-- /.modal-content -->
-		</div><!-- /.modal-dialog -->
-	</div><!-- /.modal -->
+			</div>
+		</div>
+	</div>

templates/partials/move_post_modal.tpl

@@ -1,4 +1,4 @@
-<div id="move-post-modal" class="hide" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true" data-backdrop="none">
+<div id="move-post-modal" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true" data-backdrop="none">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">

templates/partials/move_thread_modal.tpl

@@ -6,7 +6,8 @@
 				<h3>[[topic:move_topic]]</h3>
 			</div>
 			<div class="modal-body">
-				<p id="categories-loading"><i class="fa fa-spin fa-refresh"></i> [[topic:load_categories]]</p>
+				<!-- IMPORT partials/category_list.tpl -->
+
 				<p>
 					[[topic:disabled_categories_note]]
 				</p>

templates/topic.tpl

@@ -34,13 +34,14 @@
 				<meta itemprop="dateModified" content="{posts.relativeEditTime}">
 
 				<!-- IMPORT partials/topic/post.tpl -->
-			</li>
 
-			<!-- IF !posts.index -->
-			<li class="post-bar" data-index="{posts.index}">
-				<!-- IMPORT partials/post_bar.tpl -->
+				<!-- IF !posts.index -->
+				<div class="post-bar" data-index="{posts.index}">
+					<!-- IMPORT partials/post_bar.tpl -->
+				</div>
+				<!-- ENDIF !posts.index -->
 			</li>
-			<!-- ENDIF !posts.index -->
+
 		<!-- END posts -->
 	</ul>
 
@@ -52,9 +53,6 @@
 		<!-- IMPORT partials/paginator.tpl -->
 	<!-- ENDIF config.usePagination -->
 
-	<!-- IMPORT partials/move_thread_modal.tpl -->
-	<!-- IMPORT partials/fork_thread_modal.tpl -->
-	<!-- IMPORT partials/move_post_modal.tpl -->
 </div>
 
 <!-- IF !config.usePagination -->