Merge branch 'master' into mobile-menu

10 years ago · 0adb26d097
parent 137a24a8a6 ead1698c4f
commit 0adb26d097
8 changed files with 41 additions and 43 deletions
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "nodebb-theme-persona",
-  "version": "2.0.26",
+  "version": "2.0.28",
  "nbbpm": {
    "compatibility": "^0.7.1"
  },
--- a/templates/account/edit.tpl
+++ b/templates/account/edit.tpl
@ -3,7 +3,7 @@

 <div class="account">
 	<div class="row">
-		<div class="col-md-2" style="text-align: center; margin-bottom:20px;">
+		<div class="col-md-2">
 			<div class="account-picture-block text-center">
 				<img id="user-current-picture" class="user-profile-picture" src="{picture}" /><br /><br />
 				<a id="changePictureBtn" href="#" class="btn btn-primary">[[user:change_picture]]</a>
@ -98,7 +98,6 @@
 		</div>

 		<div class="col-md-5">
-			<div style="vertical-align:top;">
 			<form class='form-horizontal'>
 				<!-- IF isSelf -->
 				<div class="control-group">
@ -136,7 +135,6 @@
 			</form>
 		</div>
 	</div>
-	</div>

 	<!-- IMPORT partials/modals/change_picture_modal.tpl -->
 	<!-- IMPORT partials/modals/upload_picture_from_url_modal.tpl -->
--- a/templates/groups/details.tpl
+++ b/templates/groups/details.tpl
@ -188,7 +188,7 @@
 						<button component="groups/userTitleOption" type="button" class="btn btn-default btn-sm" data-action="color-select"<!-- IF !group.userTitleEnabled --> disabled<!-- ENDIF !group.userTitleEnabled -->>[[groups:details.change_colour]]</button>
 						<input type="hidden" name="labelColor" value="<!-- IF group.labelColor -->{group.labelColor}<!-- ENDIF group.labelColor -->" />
 						<input type="hidden" name="icon" value="<!-- IF group.icon -->{group.icon}<!-- ENDIF group.icon -->" />
-						<div id="icons" style="display:none;">
+						<div id="icons" class="hidden">
 							<div class="icon-container">
 								<div class="row fa-icons">
 									<i class="fa fa-doesnt-exist"></i>
--- a/templates/header.tpl
+++ b/templates/header.tpl
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{defaultLang}">
+<html lang="{function.localeToHTML, defaultLang}">
 <head>
 	<title>{browserTitle}</title>
 	<!-- BEGIN metaTags -->
--- a/templates/partials/move_thread_modal.tpl
+++ b/templates/partials/move_thread_modal.tpl
@ -10,7 +10,7 @@
 				<p>
 					[[topic:disabled_categories_note]]
 				</p>
-				<div id="move-confirm" style="display: none;">
+				<div id="move-confirm" class="hidden">
 					<hr />
 					<div class="alert alert-info">[[topic:topic_will_be_moved_to]] <strong><span id="confirm-category-name"></span></strong></div>
 				</div>
--- a/templates/partials/post_bar.tpl
+++ b/templates/partials/post_bar.tpl
@ -7,7 +7,7 @@
 </span>

 <div class="topic-main-buttons pull-right">
-	<span class="loading-indicator btn pull-left" done="0" style="display:none;">
+	<span class="loading-indicator btn pull-left hidden" done="0">
 		<span class="hidden-xs">[[topic:loading_more_posts]]</span> <i class="fa fa-refresh fa-spin"></i>
 	</span>

@ -25,6 +25,6 @@

 	<!-- IMPORT partials/thread_tools.tpl -->
 </div>
-<div style="clear:both;"></div>
+<div class="clearfix"></div>

 <hr />
--- a/templates/reset.tpl
+++ b/templates/reset.tpl
@ -6,11 +6,11 @@
 </div>

 <div class="well">
-	<div class="alert alert-success" id="success" style="display:none">
+	<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>
 	</div>
-	<div class="alert alert-danger" id="error" style="display:none">
+	<div class="alert alert-danger hidden" id="error">
 		<button type="button" class="close" data-dismiss="alert">&times;</button>
 		<strong>[[reset_password:invalid_email]]</strong>
 	</div>
--- a/templates/reset_code.tpl
+++ b/templates/reset_code.tpl
@ -7,12 +7,12 @@
 		[[reset_password:password_expired]]
 	</div>
 	<!-- ENDIF displayExpiryNotice -->
-	<div class="alert alert-success" id="success" style="display:none">
+	<div class="alert alert-success hidden" id="success">
 		<button type="button" class="close" data-dismiss="alert">&times;</button>
 		<strong>[[reset_password:password_changed.title]]</strong>
 		<p>[[reset_password:password_changed.message]]</p>
 	</div>
-	<div class="alert alert-warning" id="notice" style="display:none">
+	<div class="alert alert-warning hidden" id="notice">
 		<strong></strong>
 		<p></p>
 	</div>