Merge branch 'master' into develop

less/header.less

@@ -242,10 +242,6 @@
 			margin-left: -30px;
 		}
 	}
-
-	@media (min-width: @screen-md-min) {
-		top: 0px !important;
-	}
 }
 
 .breadcrumb {

lib/persona.js

@@ -8,10 +8,22 @@ $(document).ready(function() {
 	setupEditedByIcon();
 	setupMobileMenu();
 	setupQuickReply();
+	configureNavbarHiding();
 
-	$(".navbar-fixed-top").autoHidingNavbar({
-		showOnBottom: false
+	$(window).on('resize', utils.debounce(configureNavbarHiding, 200));
+
+	function configureNavbarHiding () {
+		var navbarEl = $(".navbar-fixed-top");
+		navbarEl.autoHidingNavbar('destroy');
+		navbarEl.css('top', '');
+
+		var env = utils.findBootstrapEnvironment();
+		if (env === 'xs' || env ==='sm') {
+			navbarEl.autoHidingNavbar({
+				showOnBottom: false,
 			});
+		}
+	}
 
 	function setupNProgress() {
 		$(window).on('action:ajaxify.start', function() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "7.2.11",
+  "version": "7.2.16",
   "nbbpm": {
     "compatibility": "^1.7.0"
   },

templates/account/edit.tpl

@@ -56,13 +56,14 @@
 								<input class="form-control" type="text" id="inputFullname" placeholder="[[user:fullname]]" value="{fullname}">
 							</div>
 						</div>
-
+						<!-- IF allowWebsite -->
 						<div class="control-group">
 							<label class="control-label" for="inputWebsite">[[user:website]]</label>
 							<div class="controls">
 								<input class="form-control" type="text" id="inputWebsite" placeholder="http://..." value="{website}">
 							</div>
 						</div>
+						<!-- ENDIF allowWebsite -->
 
 						<div class="control-group">
 							<label class="control-label" for="inputLocation">[[user:location]]</label>
@@ -92,12 +93,16 @@
 							</div>
 						</div>
 
+						<!-- IF allowAboutMe -->
 						<div class="control-group">
 							<label class="control-label" for="inputAboutMe">[[user:aboutme]]</label> <small><label id="aboutMeCharCountLeft"></label></small>
 							<div class="controls">
 								<textarea class="form-control" id="inputAboutMe" rows="5">{aboutme}</textarea>
 							</div>
 						</div>
+						<!-- ENDIF allowAboutMe -->
+
+						<!-- IF allowSignature -->
 						<!-- IF !disableSignatures -->
 						<div class="control-group">
 							<label class="control-label" for="inputSignature">[[user:signature]]</label> <small><label id="signatureCharCountLeft"></label></small>
@@ -106,6 +111,7 @@
 							</div>
 						</div>
 						<!-- ENDIF !disableSignatures -->
+						<!-- allowSignature -->
 
 						<input type="hidden" id="inputUID" value="{uid}"><br />
 

templates/account/settings.tpl

@@ -158,7 +158,7 @@
 					</div>
 					<div class="form-group col-xs-5">
 						<select class="form-control" data-property="{notificationSettings.name}">
-							<option value="none" <!-- IF notificationSettings.notification -->selected<!-- ENDIF notificationSettings.notification -->>[[notifications:none]]</option>
+							<option value="none" <!-- IF notificationSettings.none -->selected<!-- ENDIF notificationSettings.none -->>[[notifications:none]]</option>
 							<option value="notification" <!-- IF notificationSettings.notification -->selected<!-- ENDIF notificationSettings.notification -->>[[notifications:notification_only]]</option>
 							<option value="email" <!-- IF notificationSettings.email -->selected<!-- ENDIF notificationSettings.email -->>[[notifications:email_only]]</option>
 							<option value="notificationemail" <!-- IF notificationSettings.notificationemail -->selected<!-- ENDIF notificationSettings.notificationemail -->>[[notifications:notification_and_email]]</option>

yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-pulling@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/pulling/-/pulling-1.1.0.tgz#d1460833b623fedcb73c71efb4cbb6824d990749"
+pulling@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/pulling/-/pulling-1.1.1.tgz#948c72ec75d76c4ff41d6cec1ef1208c8d9d18f6"
 
-striptags@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.1.0.tgz#763e534338d9cf542f004a4b1eb099e32d295e44"
+striptags@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.1.1.tgz#c8c3e7fdd6fb4bb3a32a3b752e5b5e3e38093ebd"