From d8e279ced785fcc4316bbe6e07b47dedfc82ba48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Fri, 12 Jan 2018 17:10:43 -0500
Subject: [PATCH 01/13] add rep settings

---
 templates/account/edit.tpl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl
index a6e0754..e19d03d 100644
--- a/templates/account/edit.tpl
+++ b/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 />
 

From c227e5f934ce46e0bae400850e99a4c58459fc8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Fri, 12 Jan 2018 17:11:58 -0500
Subject: [PATCH 02/13] 7.2.12

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 47aebea..68f9976 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "7.2.11",
+  "version": "7.2.12",
   "nbbpm": {
     "compatibility": "^1.7.0"
   },

From 5a3e40b999324f4547d8ead86b1a65ef900bc3dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Sat, 13 Jan 2018 18:22:20 -0500
Subject: [PATCH 03/13] fix typo in template

---
 templates/account/settings.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/account/settings.tpl b/templates/account/settings.tpl
index a4ddd65..5f249c3 100644
--- a/templates/account/settings.tpl
+++ b/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>

From b61842774a685000d27455a9ea911cae28d5a062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Sat, 13 Jan 2018 18:23:23 -0500
Subject: [PATCH 04/13] 7.2.13

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 68f9976..3cd8097 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "7.2.12",
+  "version": "7.2.13",
   "nbbpm": {
     "compatibility": "^1.7.0"
   },

From bec13e8138aeaae332f75b3c577bc5f6c22c7e05 Mon Sep 17 00:00:00 2001
From: Linda Badurina <lindabadurina@hotmail.com>
Date: Mon, 15 Jan 2018 12:30:52 -0500
Subject: [PATCH 05/13] Alignment Fixes; Closes #371 (#399)

* test

* gg

* Improper Alignment CSS Fixes

Adjusted the category titles and stats to properly line up with eachother

* add gitignore

* removed symlink that we added by mistake
---
 .gitignore           | 3 ++-
 less/categories.less | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index fea06b1..c2a6cda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ sftp-config.json
 *.sublime-workspace
 .idea
 .vscode
-node_modules/
\ No newline at end of file
+node_modules/
+.DS_Store
\ No newline at end of file
diff --git a/less/categories.less b/less/categories.less
index 40d9685..d96190a 100644
--- a/less/categories.less
+++ b/less/categories.less
@@ -40,6 +40,7 @@
 				line-height: 22px;
 				margin: 0;
 				margin-left: 62px;
+				margin-top: 4px;
 
 				strong {
 					color: @gray-dark;
@@ -190,7 +191,7 @@
 .stats {
 	font-size: 20px;
 	text-align: center;
-	margin-top: 7px;
+	margin-top: 3px;
 	line-height: 22px;
 
 	small {

From 64e8f65395f4f5de14a671bce13518b84e126859 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Mon, 15 Jan 2018 12:31:23 -0500
Subject: [PATCH 06/13] 7.2.14

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3cd8097..556462c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "7.2.13",
+  "version": "7.2.14",
   "nbbpm": {
     "compatibility": "^1.7.0"
   },

From 11cce1c2db1837afcd2f5670913cf952cf9d60f9 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 15 Jan 2018 15:01:56 -0500
Subject: [PATCH 07/13] Revert "Alignment Fixes; Closes #371 (#399)"

This reverts commit bec13e8138aeaae332f75b3c577bc5f6c22c7e05.
---
 .gitignore           | 3 +--
 less/categories.less | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index c2a6cda..fea06b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,4 @@ sftp-config.json
 *.sublime-workspace
 .idea
 .vscode
-node_modules/
-.DS_Store
\ No newline at end of file
+node_modules/
\ No newline at end of file
diff --git a/less/categories.less b/less/categories.less
index d96190a..40d9685 100644
--- a/less/categories.less
+++ b/less/categories.less
@@ -40,7 +40,6 @@
 				line-height: 22px;
 				margin: 0;
 				margin-left: 62px;
-				margin-top: 4px;
 
 				strong {
 					color: @gray-dark;
@@ -191,7 +190,7 @@
 .stats {
 	font-size: 20px;
 	text-align: center;
-	margin-top: 3px;
+	margin-top: 7px;
 	line-height: 22px;
 
 	small {

From fd730df59bb36882a661ad93b877eb1fa43a119c Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 15 Jan 2018 15:02:01 -0500
Subject: [PATCH 08/13] Revert "7.2.14"

This reverts commit 64e8f65395f4f5de14a671bce13518b84e126859.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 556462c..3cd8097 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "7.2.14",
+  "version": "7.2.13",
   "nbbpm": {
     "compatibility": "^1.7.0"
   },

From 3f43ec1af52ba35d7891bb6c1ce67ec605842db5 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 16 Jan 2018 12:23:12 -0500
Subject: [PATCH 09/13] Fixing #401

Resolving regression caused by #393, and re-introduced original
resize handler method used by @petergood -- placing it behind
lodash .debounce should appease @pitaj's concerns, but I frankly
see no other way to have this feature but also fix cases where
the header is not at the top of the page.
---
 less/header.less |  4 ----
 lib/persona.js   | 18 ++++++++++++++++--
 yarn.lock        | 12 ++++++------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/less/header.less b/less/header.less
index 48b431f..cbecba5 100644
--- a/less/header.less
+++ b/less/header.less
@@ -242,10 +242,6 @@
 			margin-left: -30px;
 		}
 	}
-
-	@media (min-width: @screen-md-min) {
-		top: 0px !important;
-	}
 }
 
 .breadcrumb {
diff --git a/lib/persona.js b/lib/persona.js
index d499883..22403b5 100644
--- a/lib/persona.js
+++ b/lib/persona.js
@@ -8,11 +8,25 @@ $(document).ready(function() {
 	setupEditedByIcon();
 	setupMobileMenu();
 	setupQuickReply();
+	configureNavbarHiding();
 
-	$(".navbar-fixed-top").autoHidingNavbar({
-		showOnBottom: false
+	require(['lodash'], function (_) {
+		$(window).on('resize', _.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() {
 			NProgress.set(0.7);
diff --git a/yarn.lock b/yarn.lock
index aca4dae..cd8b23e 100644
--- a/yarn.lock
+++ b/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"

From b0bdd0c0280c69d82d86140dedda22aca92ad7f9 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 16 Jan 2018 12:26:35 -0500
Subject: [PATCH 10/13] 7.2.14

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3cd8097..556462c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "7.2.13",
+  "version": "7.2.14",
   "nbbpm": {
     "compatibility": "^1.7.0"
   },

From 7fca217e581233a30fb99139aa63616a16dbef55 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 16 Jan 2018 12:26:54 -0500
Subject: [PATCH 11/13] 7.2.15

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 556462c..ac4922a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "7.2.14",
+  "version": "7.2.15",
   "nbbpm": {
     "compatibility": "^1.7.0"
   },

From 642d885c0d7a8ce5eb0ea424e372a73c1e48aaee Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Tue, 16 Jan 2018 16:02:07 -0500
Subject: [PATCH 12/13] use utils.debounce instead

---
 lib/persona.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/persona.js b/lib/persona.js
index 22403b5..8133ef6 100644
--- a/lib/persona.js
+++ b/lib/persona.js
@@ -10,9 +10,7 @@ $(document).ready(function() {
 	setupQuickReply();
 	configureNavbarHiding();
 
-	require(['lodash'], function (_) {
-		$(window).on('resize', _.debounce(configureNavbarHiding, 200));
-	});
+	$(window).on('resize', utils.debounce(configureNavbarHiding, 200));
 
 	function configureNavbarHiding () {
 		var navbarEl = $(".navbar-fixed-top");
@@ -25,7 +23,7 @@ $(document).ready(function() {
 				showOnBottom: false,
 			});
 		}
-	};
+	}
 
 	function setupNProgress() {
 		$(window).on('action:ajaxify.start', function() {

From f11b1a33a85bdb0346ee647769544dced1545573 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Tue, 16 Jan 2018 16:02:18 -0500
Subject: [PATCH 13/13] 7.2.16

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ac4922a..b32820c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "7.2.15",
+  "version": "7.2.16",
   "nbbpm": {
     "compatibility": "^1.7.0"
   },