From b59e57a00c28beff556049e6e2067d109dc2d1b2 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 23 Sep 2015 18:49:55 -0400
Subject: [PATCH 01/41] bookmarked sticker

---
 less/topic.less                   | 17 +++++++++++++++++
 templates/partials/topic/post.tpl |  1 +
 2 files changed, 18 insertions(+)

diff --git a/less/topic.less b/less/topic.less
index e0a7581..41bb14c 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -62,6 +62,19 @@
 		right: 25px;
 	}
 
+	.bookmarked {
+		position: absolute;
+		top: 1px;
+		padding-top: 3px;
+		border-radius: 4px;
+		right: 72px;
+		font-size: 10px;
+		padding-bottom: 4px;
+		background: darken(@brand-info, 20%);
+		opacity: 0;
+		.transition(0.75s ease-in-out opacity);
+	}
+
 	[component="post/upvote"], [component="post/downvote"] {
 		color: @gray-light;
 	}
@@ -237,6 +250,10 @@
 				border-color: darken(@brand-info, 20%);
 				box-shadow: 0px 0px 1px @brand-info;
 			}
+
+			&.highlight .bookmarked {
+				opacity: 1;
+			}
 		}
 
 		.content {
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index b049d7c..669d0b2 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -33,6 +33,7 @@
 				<!-- ENDIF posts.user.custom_profile_info.length -->
 			</span>
 		</div>
+		<span class="badge bookmarked">new</span>
 		<div class="votes">
 			<!-- IF !reputation:disabled -->
 			<a component="post/upvote" href="#" class="<!-- IF posts.upvoted -->upvoted<!-- ENDIF posts.upvoted -->">

From 4bf2e40538d53da57c8a8e9d06bfcc77275906cc Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 23 Sep 2015 18:56:10 -0400
Subject: [PATCH 02/41] star instead

---
 templates/partials/topic/post.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index 669d0b2..011c98b 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -33,7 +33,7 @@
 				<!-- ENDIF posts.user.custom_profile_info.length -->
 			</span>
 		</div>
-		<span class="badge bookmarked">new</span>
+		<span class="badge bookmarked"><i class="fa fa-star"></i></span>
 		<div class="votes">
 			<!-- IF !reputation:disabled -->
 			<a component="post/upvote" href="#" class="<!-- IF posts.upvoted -->upvoted<!-- ENDIF posts.upvoted -->">

From c1aa40fbc5d0fd8bdaa23a713a1f72ff95d31d70 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 23 Sep 2015 18:56:21 -0400
Subject: [PATCH 03/41] 3.0.18

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

diff --git a/package.json b/package.json
index 6f0a6f7..00fe0cf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.17",
+  "version": "3.0.18",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },

From 00ac125b9103283377d97ef5bf4445506aa9da10 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 28 Sep 2015 15:45:35 -0400
Subject: [PATCH 04/41] index on post anchor

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

diff --git a/templates/topic.tpl b/templates/topic.tpl
index baa2911..8ca92a2 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -28,7 +28,7 @@
 	<ul component="topic" class="posts" data-tid="{tid}">
 		<!-- BEGIN posts -->
 			<li component="post" class="clearfix <!-- IF posts.deleted -->deleted<!-- ENDIF posts.deleted -->" <!-- IMPORT partials/data/topic.tpl -->>
-				<a component="post/anchor" name="{posts.index}"></a>
+				<a component="post/anchor" data-index="{posts.index}" name="{posts.index}"></a>
 
 				<meta itemprop="datePublished" content="{posts.relativeTime}">
 				<meta itemprop="dateModified" content="{posts.relativeEditTime}">

From 2b9783f675fae212a7cfec2cdabced064fa649ce Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 28 Sep 2015 15:45:51 -0400
Subject: [PATCH 05/41] 3.0.19

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

diff --git a/package.json b/package.json
index 00fe0cf..f0b966c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.18",
+  "version": "3.0.19",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },

From 5952db2868b98f3826f514b4bd3e926092f2c979 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 28 Sep 2015 15:46:35 -0400
Subject: [PATCH 06/41] 3.0.20

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

diff --git a/package.json b/package.json
index f0b966c..4bd4866 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.19",
+  "version": "3.0.20",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },

From c757368a078e796643f7dc0dff296d257e1cc8d3 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 28 Sep 2015 15:48:02 -0400
Subject: [PATCH 07/41] ghfw :rage1:

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

diff --git a/package.json b/package.json
index 4bd4866..4c750ce 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.20",
+  "version": "3.0.24",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },

From 3dd30a84d73ac52b880aac7d6ff665f1bf371c63 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 28 Sep 2015 16:08:12 -0400
Subject: [PATCH 08/41] removed mobile paginator experiment

---
 lib/persona.js         | 71 ------------------------------------------
 modules.less           |  3 +-
 modules/paginator.less | 41 ------------------------
 3 files changed, 1 insertion(+), 114 deletions(-)
 delete mode 100644 modules/paginator.less

diff --git a/lib/persona.js b/lib/persona.js
index bfd56f2..7fd9e07 100644
--- a/lib/persona.js
+++ b/lib/persona.js
@@ -6,7 +6,6 @@ $(document).ready(function() {
 	setupNProgress();
 	setupTaskbar();
 	setupEditedByIcon();
-	setupPaginator();
 	setupMobileMenu();
 
 	var env = utils.findBootstrapEnvironment();
@@ -88,76 +87,6 @@ $(document).ready(function() {
 		$(window).on('action:posts.loaded', activateEditedTooltips);
 	}
 
-	function setupPaginator() {
-		function appendPageNumber(ev, data) {
-			var el = data.after ? data.after : data.before;
-			if (!el) {
-				return;
-			}
-			var	page = Math.ceil((el.attr('data-index') - 1) / config.postsPerPage),
-				handle = $('<div class="page-number pointer">' + page + '</div>'),
-				shadow = $('<div class="shadow"></div>');
-
-			el.append(handle);
-			el.append(shadow);
-
-			handle.tooltip({
-				title: 'Slide to paginate',
-				placement: 'auto left'
-			});
-
-			var dragging = false, originalX = 0, toPage = page;
-			handle.on('touchstart', function(ev) {
-				dragging = true;
-				originalX = ev.originalEvent.touches[0].clientX;
-			});
-
-			$('#content').on('touchend', function() {
-				if (dragging === true) {
-					dragging = false;
-					if (page !== toPage) {
-						ajaxify.go('topic/' + ajaxify.data.slug + '/' + (toPage * config.postsPerPage));
-					}
-
-					shadow.removeClass('active');
-				}
-			});
-
-			$('#content').on('touchmove', function(ev) {
-				if (!dragging) {
-					return;
-				}
-
-				var distance = ev.originalEvent.touches[0].clientX - originalX,
-					handlePos = parseInt(handle.css('left'), 10),
-					postWidth = handle.parents('[component="post"]').width();
-
-				toPage = Math.ceil((handlePos + distance) / postWidth * ajaxify.data.pageCount);
-
-				if (toPage >= ajaxify.data.pageCount) {
-					toPage = (ajaxify.data.pageCount - 1);
-				}
-
-				if (toPage < 0) {
-					toPage = 0;
-				}
-
-				if (parseInt(handle.html(), 10) !== toPage) {
-					handle.html(toPage);
-					handle.removeClass('animated');
-					setTimeout(function() { handle.addClass('animated');}, 10);
-				}
-
-				shadow.addClass('active');
-				shadow.css('left', toPage / ajaxify.data.pageCount * postWidth + 'px');
-			});
-
-			handle.css('left', page / ajaxify.data.pageCount * handle.parents('[component="post"]').width() + 'px');
-		}
-
-		$(window).on('action:posts.loading', appendPageNumber);
-	}
-
 	function setupMobileMenu() {
 		if (!window.addEventListener) {
 			return;
diff --git a/modules.less b/modules.less
index ec1d8e7..5f41036 100644
--- a/modules.less
+++ b/modules.less
@@ -1,3 +1,2 @@
 @import "modules/taskbar";
-@import "modules/alerts";
-@import "modules/paginator";
\ No newline at end of file
+@import "modules/alerts";
\ No newline at end of file
diff --git a/modules/paginator.less b/modules/paginator.less
deleted file mode 100644
index e8a69dc..0000000
--- a/modules/paginator.less
+++ /dev/null
@@ -1,41 +0,0 @@
-.topic {
-	.page-number {
-		position: absolute;
-		bottom: 6px;
-		background: rgb(219, 68, 55);
-		padding: 4px;
-		width: 26px;
-		height: 26px;
-		text-align: center;
-		border-radius: 50%;
-		color: white;
-		font-size: 11px;
-		z-index: 1;
-
-		.user-select(none);
-
-		&.animated {
-			-webkit-animation-name: bounceIn;
-				animation-name: bounceIn;
-			-webkit-animation-duration: 0.5s;
-			animation-duration: 0.5s;
-			-webkit-animation-fill-mode: both;
-			animation-fill-mode: both;
-		}
-	}
-
-	.shadow.active {
-		border-radius: 50%;
-		width: 13px;
-		height: 13px;
-		border: 1px solid #333;
-		position: absolute;
-		bottom: 13px;
-	}
-
-	@media (min-width: @screen-md-min) {
-		.page-number {
-			display: none;
-		}
-	}
-}
\ No newline at end of file

From e75a9ec87e1ad2dbcfa26c42675aef10dd9d457c Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Tue, 29 Sep 2015 11:04:35 -0400
Subject: [PATCH 09/41] companion to nodebb/nodebb@5dcba90

---
 less/topic.less                   | 2 +-
 templates/partials/topic/post.tpl | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/less/topic.less b/less/topic.less
index 41bb14c..96e135c 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -121,7 +121,7 @@
 
 	.post-tools {
 		text-transform: lowercase;
-		:before {
+		>:before {
 			content: "\2022\0020";
 		}
 		a {
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index 011c98b..a50e804 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -23,6 +23,7 @@
 			<span class="post-tools">
 				<a component="post/reply" href="#" class="no-select <!-- IF !privileges.topics:reply -->hidden<!--ENDIF !privileges.topics:reply -->">[[topic:reply]]</a>
 				<a component="post/quote" href="#" class="no-select <!-- IF !privileges.topics:reply -->hidden<!--ENDIF !privileges.topics:reply -->">[[topic:quote]]</a>
+				<!-- IF posts.toPid --><a component="post/parent" href="#" class="no-select" data-index="{posts.parent.index}"><i class="fa fa-reply"></i> @{posts.parent.username}</a><!-- ENDIF posts.toPid -->
 			</span>
 			<span>
 				<!-- IF posts.user.custom_profile_info.length -->

From ad90a395b23b474fdb87f14c7df4b3c10d55589f Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Tue, 29 Sep 2015 11:04:39 -0400
Subject: [PATCH 10/41] 3.0.25

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

diff --git a/package.json b/package.json
index 4c750ce..d59aff8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.24",
+  "version": "3.0.25",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },

From 68b04b42f8db40ccfbe4b4e53cd0e2f495184925 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 29 Sep 2015 14:36:13 -0400
Subject: [PATCH 11/41] toPid change

---
 less/topic.less                   | 5 +++--
 templates/partials/topic/post.tpl | 8 +++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/less/topic.less b/less/topic.less
index 96e135c..206d2fc 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -2,7 +2,7 @@
 	h1 {
 		line-height: 40px;
 		margin-bottom: 30px;
-		
+
 		.topic-title {
 			font-size: 28px;
 			color:inherit;
@@ -121,9 +121,10 @@
 
 	.post-tools {
 		text-transform: lowercase;
-		>:before {
+		a::before {
 			content: "\2022\0020";
 		}
+
 		a {
 			.pointer;
 		}
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index a50e804..b8486ef 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -23,7 +23,9 @@
 			<span class="post-tools">
 				<a component="post/reply" href="#" class="no-select <!-- IF !privileges.topics:reply -->hidden<!--ENDIF !privileges.topics:reply -->">[[topic:reply]]</a>
 				<a component="post/quote" href="#" class="no-select <!-- IF !privileges.topics:reply -->hidden<!--ENDIF !privileges.topics:reply -->">[[topic:quote]]</a>
-				<!-- IF posts.toPid --><a component="post/parent" href="#" class="no-select" data-index="{posts.parent.index}"><i class="fa fa-reply"></i> @{posts.parent.username}</a><!-- ENDIF posts.toPid -->
+				<!-- IF posts.toPid -->
+				<button component="post/parent" class="btn btn-xs" data-topid="{posts.toPid}"><i class="fa fa-reply"></i> @{posts.parent.username} <i class="fa fa-caret-down"></i></button>
+				<!-- ENDIF posts.toPid -->
 			</span>
 			<span>
 				<!-- IF posts.user.custom_profile_info.length -->
@@ -54,7 +56,11 @@
 </div>
 
 <br />
+
 <div class="content" component="post/content" itemprop="text">
+	<!-- IF posts.toPid -->
+	<div class="well hidden" data-topid="{posts.toPid}" component="post/parent/content"></div>
+	<!-- ENDIF posts.toPid -->
 	{posts.content}
 </div>
 <!-- IF posts.user.signature -->

From 28fcda08a0c86885ed6ed8f7d2b5ec19135c60c7 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 29 Sep 2015 14:36:36 -0400
Subject: [PATCH 12/41] 3.0.26

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

diff --git a/package.json b/package.json
index d59aff8..24bbcd9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.25",
+  "version": "3.0.26",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },

From 3bbd15b13a0b20b0874bcaaaffd0e1fee60526b5 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 29 Sep 2015 14:43:12 -0400
Subject: [PATCH 13/41] added btn-default

---
 templates/partials/topic/post.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index b8486ef..0213970 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -24,7 +24,7 @@
 				<a component="post/reply" href="#" class="no-select <!-- IF !privileges.topics:reply -->hidden<!--ENDIF !privileges.topics:reply -->">[[topic:reply]]</a>
 				<a component="post/quote" href="#" class="no-select <!-- IF !privileges.topics:reply -->hidden<!--ENDIF !privileges.topics:reply -->">[[topic:quote]]</a>
 				<!-- IF posts.toPid -->
-				<button component="post/parent" class="btn btn-xs" data-topid="{posts.toPid}"><i class="fa fa-reply"></i> @{posts.parent.username} <i class="fa fa-caret-down"></i></button>
+				<button component="post/parent" class="btn btn-xs btn-default" data-topid="{posts.toPid}"><i class="fa fa-reply"></i> @{posts.parent.username} <i class="fa fa-caret-down"></i></button>
 				<!-- ENDIF posts.toPid -->
 			</span>
 			<span>

From 4cbbfd310c815740ad5f24c1ed5cb9854c13806a Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 29 Sep 2015 14:43:37 -0400
Subject: [PATCH 14/41] 3.0.27

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

diff --git a/package.json b/package.json
index 24bbcd9..713d4c4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.26",
+  "version": "3.0.27",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },

From a2aafa65d4bc55876e592ef7a57a52107ba1960d Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 29 Sep 2015 15:46:23 -0400
Subject: [PATCH 15/41] removed toPid content

---
 templates/partials/topic/post.tpl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index 0213970..b3c07c7 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -58,9 +58,6 @@
 <br />
 
 <div class="content" component="post/content" itemprop="text">
-	<!-- IF posts.toPid -->
-	<div class="well hidden" data-topid="{posts.toPid}" component="post/parent/content"></div>
-	<!-- ENDIF posts.toPid -->
 	{posts.content}
 </div>
 <!-- IF posts.user.signature -->

From 75617e150795d022f14f03eb9e98c0e62625c1e2 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 29 Sep 2015 15:46:53 -0400
Subject: [PATCH 16/41] 3.0.28

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

diff --git a/package.json b/package.json
index 713d4c4..5eda986 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.27",
+  "version": "3.0.28",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },

From 1ece3acb484fd9b7d773de52bab6c47690971220 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 29 Sep 2015 17:33:47 -0400
Subject: [PATCH 17/41] closes https://github.com/NodeBB/NodeBB/issues/3675

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

diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl
index b84d234..a84502a 100644
--- a/templates/account/edit.tpl
+++ b/templates/account/edit.tpl
@@ -137,6 +137,7 @@
 
 			<hr />
 
+			<!-- IF sso.length -->
 			<label class="control-label">[[user:sso.title]]</label>
 			<div class="list-group">
 				<!-- BEGIN sso -->
@@ -147,6 +148,7 @@
 				</a>
 				<!-- END sso -->
 			</div>
+			<!-- ENDIF sso.length -->
 		</div>
 	</div>
 

From a6b2ba89970d3b55e99fd7da571cb2fe80ebb469 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 29 Sep 2015 18:38:30 -0400
Subject: [PATCH 18/41] https://github.com/NodeBB/NodeBB/issues/3569

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

diff --git a/templates/footer.tpl b/templates/footer.tpl
index e93b664..ff8493d 100644
--- a/templates/footer.tpl
+++ b/templates/footer.tpl
@@ -1,7 +1,7 @@
 		</div><!--END container -->
 	</main>
 
-	<div class="hide tpl-500">
+	<div class="hide">
 	<!-- IMPORT 500.tpl -->
 	</div>
 

From 7ac7e4ddfd86a142b43efcbaf5e027fd49c07206 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 29 Sep 2015 18:40:01 -0400
Subject: [PATCH 19/41] 3.0.29

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

diff --git a/package.json b/package.json
index 5eda986..c0443d5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.28",
+  "version": "3.0.29",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },

From 1178251f86f228564f3c8350898da1cb89a916c7 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 1 Oct 2015 13:55:07 -0400
Subject: [PATCH 20/41] added last post link and post count on mobile

---
 less/categories.less               | 1 -
 less/category.less                 | 1 +
 templates/partials/topics_list.tpl | 7 +++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/less/categories.less b/less/categories.less
index 797c967..0134b87 100644
--- a/less/categories.less
+++ b/less/categories.less
@@ -32,7 +32,6 @@
 				line-height: 22px;
 				margin: 0;
 				margin-left: 62px;
-				width: 85%;
 
 				strong {
 					color: @gray-dark;
diff --git a/less/category.less b/less/category.less
index acd51c3..1661ecd 100644
--- a/less/category.less
+++ b/less/category.less
@@ -70,6 +70,7 @@
 					font-size: 10px;
 					background: lighten(@gray-lighter, 2.5%);
 					padding: 5px;
+					white-space: nowrap;
 				}
 			}
 		}
diff --git a/templates/partials/topics_list.tpl b/templates/partials/topics_list.tpl
index 5eb3b97..adf72c5 100644
--- a/templates/partials/topics_list.tpl
+++ b/templates/partials/topics_list.tpl
@@ -4,7 +4,7 @@
 	<li component="category/topic" class="row clearfix {function.generateTopicClass}" <!-- IMPORT partials/data/category.tpl -->>
 		<meta itemprop="name" content="{function.stripTags, title}">
 
-		<div class="col-md-7 col-sm-9 col-xs-11 content">
+		<div class="col-md-7 col-sm-9 col-xs-12 content">
 			<div class="avatar pull-left">
 				<!-- IF showSelect -->
 					<div class="select fa-square-o">
@@ -41,6 +41,9 @@
 				</span>
 
 				<small>[[global:posted_ago, <span class="timeago" title="{topics.relativeTime}"></span>]]</small>
+
+				<small class="clearfix"><span class="visible-xs"><span class="pull-right"><i class="fa fa-pencil"></i> {topics.postcount} &bull; <a href="{config.relative_path}/topic/{topics.slug}/{topics.teaser.index}"><i class="fa fa-mail-forward"></i></a></span>
+				</span></small>
 			</h2>
 		</div>
 
@@ -52,7 +55,7 @@
 			<span class="human-readable-number" title="{topics.viewcount}">{topics.viewcount}</span><br />
 			<small>[[global:views]]</small>
 		</div>
-		<div class="col-md-3 col-sm-3 col-xs-1 teaser hidden-xs">
+		<div class="col-md-3 col-sm-3 teaser hidden-xs">
 			<div class="card" style="border-color: {topics.category.bgColor}">
 				<!-- IF topics.unreplied -->
 				<p class="hidden-xs">

From 9effb0947a72ea70e980232fdcf2f3025f63105e Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 1 Oct 2015 13:55:43 -0400
Subject: [PATCH 21/41] 3.0.30

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

diff --git a/package.json b/package.json
index c0443d5..958fd85 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.29",
+  "version": "3.0.30",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },

From 3fa185aefe2dbb33d5d42fc9c24260619aaa99f9 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 1 Oct 2015 15:00:36 -0400
Subject: [PATCH 22/41] arrow-circle-right

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

diff --git a/templates/partials/topics_list.tpl b/templates/partials/topics_list.tpl
index adf72c5..2592ffe 100644
--- a/templates/partials/topics_list.tpl
+++ b/templates/partials/topics_list.tpl
@@ -42,7 +42,7 @@
 
 				<small>[[global:posted_ago, <span class="timeago" title="{topics.relativeTime}"></span>]]</small>
 
-				<small class="clearfix"><span class="visible-xs"><span class="pull-right"><i class="fa fa-pencil"></i> {topics.postcount} &bull; <a href="{config.relative_path}/topic/{topics.slug}/{topics.teaser.index}"><i class="fa fa-mail-forward"></i></a></span>
+				<small class="clearfix"><span class="visible-xs"><span class="pull-right"><i class="fa fa-pencil"></i> {topics.postcount} &bull; <a href="{config.relative_path}/topic/{topics.slug}/{topics.teaser.index}"><i class="fa fa-arrow-circle-right"></i></a></span>
 				</span></small>
 			</h2>
 		</div>

From 0fbccb38b6717faab175000b7ab933d286444efb Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 1 Oct 2015 15:46:45 -0400
Subject: [PATCH 23/41] closes #163

---
 templates/partials/post_bar.tpl    | 16 ++++++----------
 templates/partials/topic/sort.tpl  |  7 ++++---
 templates/partials/topic/stats.tpl |  8 ++++++++
 templates/partials/topic/watch.tpl |  7 +++++++
 templates/topic.tpl                | 14 ++++----------
 5 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 templates/partials/topic/stats.tpl
 create mode 100644 templates/partials/topic/watch.tpl

diff --git a/templates/partials/post_bar.tpl b/templates/partials/post_bar.tpl
index a6a37e5..6d06136 100644
--- a/templates/partials/post_bar.tpl
+++ b/templates/partials/post_bar.tpl
@@ -11,20 +11,16 @@
 		<span class="hidden-xs">[[topic:loading_more_posts]]</span> <i class="fa fa-refresh fa-spin"></i>
 	</span>
 
-	<div class="stats">
-		<span component="topic/post-count" class="human-readable-number" title="{postcount}">{postcount}</span><br />
-		<small>[[global:posts]]</small>
-	</div>
-	<div class="stats">
-		<span class="human-readable-number" title="{viewcount}">{viewcount}</span><br />
-		<small>[[global:views]]</small>
-	</div>
+	<!-- IMPORT partials/topic/stats.tpl -->
 
+	<br class="visible-xs"/>
 
 	<!-- IMPORT partials/topic/reply-button.tpl -->
 
+	<!-- IMPORT partials/topic/watch.tpl -->
+
+	<!-- IMPORT partials/topic/sort.tpl -->
+
 	<!-- IMPORT partials/thread_tools.tpl -->
 </div>
-<div class="clearfix"></div>
 
-<hr />
\ No newline at end of file
diff --git a/templates/partials/topic/sort.tpl b/templates/partials/topic/sort.tpl
index 3593275..97b27e9 100644
--- a/templates/partials/topic/sort.tpl
+++ b/templates/partials/topic/sort.tpl
@@ -1,7 +1,8 @@
 <!-- IF loggedIn -->
-<div class="btn-group hidden-xs hidden-sm" component="thread/sort">
-	<button class="btn dropdown-toggle" data-toggle="dropdown" type="button">[[topic:sort_by]] <span class="caret"></span></button>
-	<ul class="dropdown-menu">
+<div class="btn-group" component="thread/sort">
+	<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:sort_by]]</span>
+	<span class="visible-xs-inline"><i class="fa fa-fw fa-sort"></i></span> <span class="caret"></span></button>
+	<ul class="dropdown-menu dropdown-menu-right">
 		<li><a href="#" class="oldest_to_newest" data-sort="oldest_to_newest"><i class="fa fa-fw"></i> [[topic:oldest_to_newest]]</a></li>
 		<li><a href="#" class="newest_to_oldest" data-sort="newest_to_oldest"><i class="fa fa-fw"></i> [[topic:newest_to_oldest]]</a></li>
 		<li><a href="#" class="most_votes" data-sort="most_votes"><i class="fa fa-fw"></i> [[topic:most_votes]]</a></li>
diff --git a/templates/partials/topic/stats.tpl b/templates/partials/topic/stats.tpl
new file mode 100644
index 0000000..37eadc9
--- /dev/null
+++ b/templates/partials/topic/stats.tpl
@@ -0,0 +1,8 @@
+<div class="stats hidden-xs">
+	<span component="topic/post-count" class="human-readable-number" title="{postcount}">{postcount}</span><br />
+	<small>[[global:posts]]</small>
+</div>
+<div class="stats hidden-xs">
+	<span class="human-readable-number" title="{viewcount}">{viewcount}</span><br />
+	<small>[[global:views]]</small>
+</div>
\ No newline at end of file
diff --git a/templates/partials/topic/watch.tpl b/templates/partials/topic/watch.tpl
new file mode 100644
index 0000000..63a5712
--- /dev/null
+++ b/templates/partials/topic/watch.tpl
@@ -0,0 +1,7 @@
+<button component="topic/follow" class="btn btn-info <!-- IF isFollowing -->hidden<!-- ENDIF isFollowing -->">
+	<span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:watch]]</span> <i class="fa fa-eye"></i>
+</button>
+
+<button component="topic/unfollow" class="btn btn-warning <!-- IF !isFollowing -->hidden<!-- ENDIF !isFollowing -->">
+	<span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:unwatch]]</span> <i class="fa fa-eye-slash"></i>
+</button>
\ No newline at end of file
diff --git a/templates/topic.tpl b/templates/topic.tpl
index 8ca92a2..4319c6d 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -4,15 +4,7 @@
 	<h1 component="post/header" itemprop="name">
 
 		<i class="fa fa-thumb-tack <!-- IF !pinned -->hidden<!-- ENDIF !pinned -->"></i> <i class="fa fa-lock <!-- IF !locked -->hidden<!-- ENDIF !locked -->"></i> <span class="topic-title" component="topic/title">{title}</span>
-		<!-- IMPORT partials/topic/sort.tpl -->
 
-		<button component="topic/follow" class="btn hidden-xs hidden-sm <!-- IF isFollowing -->hidden<!-- ENDIF isFollowing -->">
-			<span>[[topic:watch]]</span> <i class="fa fa-eye"></i>
-		</button>
-
-		<button component="topic/unfollow" class="btn hidden-xs hidden-sm <!-- IF !isFollowing -->hidden<!-- ENDIF !isFollowing -->">
-			<span>[[topic:unwatch]]</span> <i class="fa fa-eye-slash"></i>
-		</button>
 
 		<span class="browsing-users hidden hidden-xs hidden-sm pull-right">
 			<span>[[category:browsing]]</span>
@@ -36,18 +28,20 @@
 				<!-- IMPORT partials/topic/post.tpl -->
 
 				<!-- IF !posts.index -->
-				<div class="post-bar" data-index="{posts.index}">
+				<div class="post-bar clearfix" data-index="{posts.index}">
 					<!-- IMPORT partials/post_bar.tpl -->
 				</div>
+				<hr />
 				<!-- ENDIF !posts.index -->
 			</li>
 
 		<!-- END posts -->
 	</ul>
 
-	<div class="post-bar bottom-post-bar <!-- IF unreplied -->hidden<!-- ENDIF unreplied -->">
+	<div class="post-bar bottom-post-bar clearfix <!-- IF unreplied -->hidden<!-- ENDIF unreplied -->">
 		<!-- IMPORT partials/post_bar.tpl -->
 	</div>
+	<hr />
 
 	<!-- IF config.usePagination -->
 		<!-- IMPORT partials/paginator.tpl -->

From 1131331da0f8213100fe00c620a7aed7767e1f48 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 1 Oct 2015 15:46:59 -0400
Subject: [PATCH 24/41] 3.0.31

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

diff --git a/package.json b/package.json
index 958fd85..e4f3ddc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.30",
+  "version": "3.0.31",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },

From bd03dd4836ef58a8ba65567d672da95e9bfaecee Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 1 Oct 2015 17:42:48 -0400
Subject: [PATCH 25/41] mobile paginator

---
 less/topic.less             | 18 ++++++++++++++++++
 templates/partials/menu.tpl |  2 +-
 templates/topic.tpl         | 12 ++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/less/topic.less b/less/topic.less
index 206d2fc..64d7c45 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -319,6 +319,24 @@
 			}
 		}
 	}
+
+	.pagination-block {
+		position: fixed;
+		width: 100%;
+		background-color: #eee;
+		bottom: 0px;
+		left: 0px;
+
+		.wrapper {
+			padding: 5px 0px 5px 0px;
+		}
+		.progress-bar {
+			background-color: @brand-info;
+			display:block;
+			z-index: -1;
+			position: absolute;
+		}
+	}
 }
 
 .thread_active_users {
diff --git a/templates/partials/menu.tpl b/templates/partials/menu.tpl
index 236ca3c..184ef97 100644
--- a/templates/partials/menu.tpl
+++ b/templates/partials/menu.tpl
@@ -153,7 +153,7 @@
 						<i class="fa fa-angle-up pointer fa-fw pageup"></i>
 
 						<a href="#" class="dropdown-toggle" data-toggle="dropdown">
-							<span id="pagination"></span>
+							<span class="pagination-text"></span>
 						</a>
 
 						<i class="fa fa-angle-down pointer fa-fw pagedown"></i>
diff --git a/templates/topic.tpl b/templates/topic.tpl
index 4319c6d..d88106c 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -47,6 +47,17 @@
 		<!-- IMPORT partials/paginator.tpl -->
 	<!-- ENDIF config.usePagination -->
 
+	<div class="visible-xs visible-sm pagination-block text-center">
+		<div class="progress-bar"></div>
+		<div class="wrapper">
+			<i class="fa fa-2x fa-angle-double-up pointer fa-fw pagetop"></i>
+			<i class="fa fa-2x fa-angle-up pointer fa-fw pageup"></i>
+			<span class="pagination-text"></span>
+			<i class="fa fa-2x fa-angle-down pointer fa-fw pagedown"></i>
+			<i class="fa fa-2x fa-angle-double-down pointer fa-fw pagebottom"></i>
+		</div>
+	</div>
+
 </div>
 
 <!-- IF !config.usePagination -->
@@ -54,3 +65,4 @@
 	<!-- IMPORT partials/paginator.tpl -->
 </noscript>
 <!-- ENDIF !config.usePagination -->
+

From 48b19b72c41a082eaede3315ff03c723de9d20fc Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 1 Oct 2015 17:43:47 -0400
Subject: [PATCH 26/41] 3.0.32

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

diff --git a/package.json b/package.json
index e4f3ddc..df7d908 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.31",
+  "version": "3.0.32",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },

From 7a0d8aa13dd1f129228bdc340d258a3bb5d94538 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 1 Oct 2015 19:06:19 -0400
Subject: [PATCH 27/41] moved clearfix to partial

---
 templates/partials/post_bar.tpl | 37 ++++++++++++++++++---------------
 templates/topic.tpl             |  8 +++----
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/templates/partials/post_bar.tpl b/templates/partials/post_bar.tpl
index 6d06136..6f7df54 100644
--- a/templates/partials/post_bar.tpl
+++ b/templates/partials/post_bar.tpl
@@ -1,26 +1,29 @@
-<span class="tags">
-	<!-- BEGIN tags -->
-	<a href="{config.relative_path}/tags/{tags.value}">
-	<span class="tag-item" data-tag="{tags.value}" style="<!-- IF tags.color -->color: {tags.color};<!-- ENDIF tags.color --><!-- IF tags.bgColor -->background-color: {tags.bgColor};<!-- ENDIF tags.bgColor -->">{tags.value}</span>
-	<span class="tag-topic-count human-readable-number" title="{tags.score}">{tags.score}</span></a>
-	<!-- END tags -->
-</span>
-
-<div class="topic-main-buttons pull-right">
-	<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>
+<div class="clearfix">
+	<span class="tags">
+		<!-- BEGIN tags -->
+		<a href="{config.relative_path}/tags/{tags.value}">
+		<span class="tag-item" data-tag="{tags.value}" style="<!-- IF tags.color -->color: {tags.color};<!-- ENDIF tags.color --><!-- IF tags.bgColor -->background-color: {tags.bgColor};<!-- ENDIF tags.bgColor -->">{tags.value}</span>
+		<span class="tag-topic-count human-readable-number" title="{tags.score}">{tags.score}</span></a>
+		<!-- END tags -->
 	</span>
 
-	<!-- IMPORT partials/topic/stats.tpl -->
+	<div class="topic-main-buttons pull-right">
+		<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>
 
-	<br class="visible-xs"/>
+		<!-- IMPORT partials/topic/stats.tpl -->
 
-	<!-- IMPORT partials/topic/reply-button.tpl -->
+		<br class="visible-xs"/>
 
-	<!-- IMPORT partials/topic/watch.tpl -->
+		<!-- IMPORT partials/topic/reply-button.tpl -->
 
-	<!-- IMPORT partials/topic/sort.tpl -->
+		<!-- IMPORT partials/topic/watch.tpl -->
 
-	<!-- IMPORT partials/thread_tools.tpl -->
+		<!-- IMPORT partials/topic/sort.tpl -->
+
+		<!-- IMPORT partials/thread_tools.tpl -->
+	</div>
 </div>
 
+<hr/>
\ No newline at end of file
diff --git a/templates/topic.tpl b/templates/topic.tpl
index d88106c..67746df 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -28,20 +28,20 @@
 				<!-- IMPORT partials/topic/post.tpl -->
 
 				<!-- IF !posts.index -->
-				<div class="post-bar clearfix" data-index="{posts.index}">
+				<div class="post-bar" data-index="{posts.index}">
 					<!-- IMPORT partials/post_bar.tpl -->
 				</div>
-				<hr />
+
 				<!-- ENDIF !posts.index -->
 			</li>
 
 		<!-- END posts -->
 	</ul>
 
-	<div class="post-bar bottom-post-bar clearfix <!-- IF unreplied -->hidden<!-- ENDIF unreplied -->">
+	<div class="post-bar bottom-post-bar <!-- IF unreplied -->hidden<!-- ENDIF unreplied -->">
 		<!-- IMPORT partials/post_bar.tpl -->
 	</div>
-	<hr />
+
 
 	<!-- IF config.usePagination -->
 		<!-- IMPORT partials/paginator.tpl -->

From 8f0eeefd46c59f2d3ddfd96db0fe5261e4dfe134 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 1 Oct 2015 19:46:07 -0400
Subject: [PATCH 28/41] category colors in topic list

---
 less/category.less                 | 6 ++++++
 templates/partials/topics_list.tpl | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/less/category.less b/less/category.less
index 1661ecd..9b008aa 100644
--- a/less/category.less
+++ b/less/category.less
@@ -73,6 +73,10 @@
 					white-space: nowrap;
 				}
 			}
+
+			.fa-stack {
+				font-size: 90%;
+			}
 		}
 
 		&:last-child li {
@@ -85,6 +89,8 @@
 			font-weight: bold;
 		}
 	}
+
+
 }
 
 .category, .categories, .subcategory {
diff --git a/templates/partials/topics_list.tpl b/templates/partials/topics_list.tpl
index 2592ffe..38c36b5 100644
--- a/templates/partials/topics_list.tpl
+++ b/templates/partials/topics_list.tpl
@@ -29,7 +29,7 @@
 
 				<!-- IF !template.category -->
 				<small>
-					<a href="{config.relative_path}/category/{topics.category.slug}"><i class="fa {topics.category.icon}"></i> {topics.category.name}</a> &bull;
+					<a href="{config.relative_path}/category/{topics.category.slug}"><span class="fa-stack fa-lg"><i style="color:{topics.category.bgColor};"class="fa fa-circle fa-stack-2x"></i><i style="color:{topics.category.color};" class="fa {topics.category.icon} fa-stack-1x"></i></span> {topics.category.name}</a> &bull;
 				</small>
 				<!-- ENDIF !template.category -->
 

From 7936019ce05043d5b354ab2322708a2229aa4994 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 1 Oct 2015 19:46:31 -0400
Subject: [PATCH 29/41] 3.0.33

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

diff --git a/package.json b/package.json
index df7d908..191371d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.32",
+  "version": "3.0.33",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },

From 407526b3b1a256c4e2e7afb61e8c2cf28b3e9189 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 1 Oct 2015 20:15:41 -0400
Subject: [PATCH 30/41] fix paginator zindex and unread width

---
 less/category.less | 1 -
 less/topic.less    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/less/category.less b/less/category.less
index 9b008aa..9a50a09 100644
--- a/less/category.less
+++ b/less/category.less
@@ -50,7 +50,6 @@
 					.transition(.2s ease-in-out opacity);
 				}
 
-				width: 50px;
 				float: left;
 			}
 
diff --git a/less/topic.less b/less/topic.less
index 64d7c45..b9e0f43 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -326,6 +326,7 @@
 		background-color: #eee;
 		bottom: 0px;
 		left: 0px;
+		z-index: 100;
 
 		.wrapper {
 			padding: 5px 0px 5px 0px;

From 5d1e3bd1986f5589bd172fce6e322a69f4a0f627 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 1 Oct 2015 20:16:52 -0400
Subject: [PATCH 31/41] 3.0.34

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

diff --git a/package.json b/package.json
index 191371d..1f3b17d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.33",
+  "version": "3.0.34",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },

From 561669fcb4f06b7fd5367b9b0d0bafc6f692fefa Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Sat, 3 Oct 2015 17:18:00 -0400
Subject: [PATCH 32/41] closes #152

---
 less/mobile.less            |  31 ++-
 lib/modules/slideout.min.js | 486 +++++++++++++++++++++++++++++++++++-
 lib/persona.js              |  19 +-
 templates/header.tpl        |   2 +-
 4 files changed, 508 insertions(+), 30 deletions(-)

diff --git a/less/mobile.less b/less/mobile.less
index d4edf6a..b578755 100644
--- a/less/mobile.less
+++ b/less/mobile.less
@@ -1,8 +1,17 @@
-#menu {
+
+.slideout-menu {
+	position: fixed;
+	left: auto;
+	top: 0;
+	bottom: 0;
+	right: 0;
+	z-index: 0;
+	width: 256px;
+	overflow-y: auto;
+	-webkit-overflow-scrolling: touch;
 	display: none;
 }
 
-
 @media (max-width: 980px) {
 	body {
 		padding-top: 0;
@@ -20,6 +29,7 @@
 	}
 
 	#menu {
+
 		padding-top: 100px;
 		background-color: #1D1F20;
 		background-image: linear-gradient(145deg, #1D1F20, #404348);
@@ -69,7 +79,7 @@
 
 		.counter {
 			font-style: normal;
-			
+
 			&:after {
 				left: 5px;
 				top: -1px;
@@ -120,19 +130,6 @@
 		}
 	}
 
-	.slideout-menu {
-		position: fixed;
-		left: auto;
-		top: 0;
-		bottom: 0;
-		right: 0;
-		z-index: 0;
-		width: 256px;
-		overflow-y: auto;
-		-webkit-overflow-scrolling: touch;
-		display: none;
-	}
-
 	.slideout-panel {
 		position: relative;
 		z-index: 1;
@@ -148,7 +145,7 @@
 	.slideout-open .slideout-menu {
 		display: block;
 	}
-	
+
 	.slideout-open {
 		overflow-y: hidden;
 		height: 100%;
diff --git a/lib/modules/slideout.min.js b/lib/modules/slideout.min.js
index e381bf0..ba1afcf 100644
--- a/lib/modules/slideout.min.js
+++ b/lib/modules/slideout.min.js
@@ -1 +1,485 @@
-!function(t){var e;"undefined"!=typeof window?e=window:"undefined"!=typeof global?e=global:"undefined"!=typeof self&&(e=self),e.Slideout=t()}(function(){var t,e,n;return function i(t,e,n){function o(s,a){if(!e[s]){if(!t[s]){var u=typeof require=="function"&&require;if(!a&&u)return u(s,!0);if(r)return r(s,!0);var f=new Error("Cannot find module '"+s+"'");throw f.code="MODULE_NOT_FOUND",f}var l=e[s]={exports:{}};t[s][0].call(l.exports,function(e){var n=t[s][1][e];return o(n?n:e)},l,l.exports,i,t,e,n)}return e[s].exports}var r=typeof require=="function"&&require;for(var s=0;s<n.length;s++)o(n[s]);return o}({1:[function(t,e,n){"use strict";var i=t("decouple");var o=t("emitter");var r;var s=false;var a=window.document;var u=a.documentElement;var f=window.navigator.msPointerEnabled;var l={start:f?"MSPointerDown":"touchstart",move:f?"MSPointerMove":"touchmove",end:f?"MSPointerUp":"touchend"};var p=function _(){var t=/^(Webkit|Khtml|Moz|ms|O)(?=[A-Z])/;var e=a.getElementsByTagName("script")[0].style;for(var n in e){if(t.test(n)){return"-"+n.match(t)[0].toLowerCase()+"-"}}if("WebkitOpacity"in e){return"-webkit-"}if("KhtmlOpacity"in e){return"-khtml-"}return""}();function c(t,e){for(var n in e){if(e[n]){t[n]=e[n]}}return t}function h(t,e){t.prototype=c(t.prototype||{},e.prototype)}function d(t){t=t||{};this._startOffsetX=0;this._currentOffsetX=0;this._opening=false;this._moved=false;this._opened=false;this._preventOpen=false;this._touch=t.touch===undefined?true:t.touch&&true;this.panel=t.panel;this.menu=t.menu;this.panel.className+=" slideout-panel";this.menu.className+=" slideout-menu";this._fx=t.fx||"ease";this._duration=parseInt(t.duration,10)||300;this._tolerance=parseInt(t.tolerance,10)||70;this._padding=this._translateTo=parseInt(t.padding,10)||256;this._orientation=t.side==="right"?-1:1;this._translateTo*=this._orientation;if(this._touch){this._initTouchEvents()}}h(d,o);d.prototype.open=function(){var t=this;this.emit("beforeopen");if(u.className.search("slideout-open")===-1){u.className+=" slideout-open"}this._setTransition();this._translateXTo(this._translateTo);this._opened=true;setTimeout(function(){t.panel.style.transition=t.panel.style["-webkit-transition"]="";t.emit("open")},this._duration+50);return this};d.prototype.close=function(){var t=this;if(!this.isOpen()&&!this._opening){return this}this.emit("beforeclose");this._setTransition();this._translateXTo(0);this._opened=false;setTimeout(function(){u.className=u.className.replace(/ slideout-open/,"");t.panel.style.transition=t.panel.style["-webkit-transition"]=t.panel.style[p+"transform"]=t.panel.style.transform="";t.emit("close")},this._duration+50);return this};d.prototype.toggle=function(){return this.isOpen()?this.close():this.open()};d.prototype.isOpen=function(){return this._opened};d.prototype._translateXTo=function(t){this._currentOffsetX=t;this.panel.style[p+"transform"]=this.panel.style.transform="translate3d("+t+"px, 0, 0)"};d.prototype._setTransition=function(){this.panel.style[p+"transition"]=this.panel.style.transition=p+"transform "+this._duration+"ms "+this._fx};d.prototype._initTouchEvents=function(){var t=this;i(a.body,"scroll",function(){if(!t._moved){clearTimeout(r);s=true;r=setTimeout(function(){s=false},250)}});a.addEventListener(l.move,function(e){if(t._moved){e.preventDefault()}});this.panel.addEventListener(l.start,function(e){if(typeof e.touches==="undefined"){return}t._moved=false;t._opening=false;t._startOffsetX=e.touches[0].pageX;t._preventOpen=!t.isOpen()&&t.menu.clientWidth!==0});this.panel.addEventListener("touchcancel",function(){t._moved=false;t._opening=false});this.panel.addEventListener(l.end,function(){if(t._moved){t._opening&&Math.abs(t._currentOffsetX)>t._tolerance?t.open():t.close()}t._moved=false});this.panel.addEventListener(l.move,function(e){if(s||t._preventOpen||typeof e.touches==="undefined"){return}var n=e.touches[0].clientX-t._startOffsetX;var i=t._currentOffsetX=n;if(Math.abs(i)>t._padding){return}if(Math.abs(n)>20){t._opening=true;var o=n*t._orientation;if(t._opened&&o>0||!t._opened&&o<0){return}if(o<=0){i=n+t._padding*t._orientation;t._opening=false}if(!t._moved&&u.className.search("slideout-open")===-1){u.className+=" slideout-open"}t.panel.style[p+"transform"]=t.panel.style.transform="translate3d("+i+"px, 0, 0)";t.emit("translate",i);t._moved=true}})};e.exports=d},{decouple:2,emitter:3}],2:[function(t,e,n){"use strict";var i=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||function(t){window.setTimeout(t,1e3/60)}}();function o(t,e,n){var o,r=false;function s(t){o=t;a()}function a(){if(!r){i(u);r=true}}function u(){n.call(t,o);r=false}t.addEventListener(e,s,false)}e.exports=o},{}],3:[function(t,e,n){"use strict";var i=function(t,e){if(!(t instanceof e)){throw new TypeError("Cannot call a class as a function")}};n.__esModule=true;var o=function(){function t(){i(this,t)}t.prototype.on=function e(t,n){this._eventCollection=this._eventCollection||{};this._eventCollection[t]=this._eventCollection[t]||[];this._eventCollection[t].push(n);return this};t.prototype.once=function n(t,e){var n=this;function i(){n.off(t,i);e.apply(this,arguments)}i.listener=e;this.on(t,i);return this};t.prototype.off=function o(t,e){var n=undefined;if(!this._eventCollection||!(n=this._eventCollection[t])){return this}n.forEach(function(t,i){if(t===e||t.listener===e){n.splice(i,1)}});if(n.length===0){delete this._eventCollection[t]}return this};t.prototype.emit=function r(t){var e=this;for(var n=arguments.length,i=Array(n>1?n-1:0),o=1;o<n;o++){i[o-1]=arguments[o]}var r=undefined;if(!this._eventCollection||!(r=this._eventCollection[t])){return this}r=r.slice(0);r.forEach(function(t){return t.apply(e,i)});return this};return t}();n["default"]=o;e.exports=n["default"]},{}]},{},[1])(1)});
\ No newline at end of file
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.Slideout=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+'use strict';
+
+/**
+ * Module dependencies
+ */
+var decouple = require('decouple');
+var Emitter = require('emitter');
+
+/**
+ * Privates
+ */
+var scrollTimeout;
+var scrolling = false;
+var doc = window.document;
+var html = doc.documentElement;
+var msPointerSupported = window.navigator.msPointerEnabled;
+var touch = {
+  'start': msPointerSupported ? 'MSPointerDown' : 'touchstart',
+  'move': msPointerSupported ? 'MSPointerMove' : 'touchmove',
+  'end': msPointerSupported ? 'MSPointerUp' : 'touchend'
+};
+var prefix = (function prefix() {
+  var regex = /^(Webkit|Khtml|Moz|ms|O)(?=[A-Z])/;
+  var styleDeclaration = doc.getElementsByTagName('script')[0].style;
+  for (var prop in styleDeclaration) {
+    if (regex.test(prop)) {
+      return '-' + prop.match(regex)[0].toLowerCase() + '-';
+    }
+  }
+  // Nothing found so far? Webkit does not enumerate over the CSS properties of the style object.
+  // However (prop in style) returns the correct value, so we'll have to test for
+  // the precence of a specific property
+  if ('WebkitOpacity' in styleDeclaration) { return '-webkit-'; }
+  if ('KhtmlOpacity' in styleDeclaration) { return '-khtml-'; }
+  return '';
+}());
+function extend(destination, from) {
+  for (var prop in from) {
+    if (from[prop]) {
+      destination[prop] = from[prop];
+    }
+  }
+  return destination;
+}
+function inherits(child, uber) {
+  child.prototype = extend(child.prototype || {}, uber.prototype);
+}
+
+/**
+ * Slideout constructor
+ */
+function Slideout(options) {
+  options = options || {};
+
+  // Sets default values
+  this._startOffsetX = 0;
+  this._currentOffsetX = 0;
+  this._opening = false;
+  this._moved = false;
+  this._opened = false;
+  this._preventOpen = false;
+  this._touch = options.touch === undefined ? true : options.touch && true;
+
+  // Sets panel
+  this.panel = options.panel;
+  this.menu = options.menu;
+
+  // Sets  classnames
+  if(this.panel.className.search('slideout-panel') === -1) { this.panel.className += ' slideout-panel'; }
+  if(this.menu.className.search('slideout-menu') === -1) { this.menu.className += ' slideout-menu'; }
+
+
+  // Sets options
+  this._fx = options.fx || 'ease';
+  this._duration = parseInt(options.duration, 10) || 300;
+  this._tolerance = parseInt(options.tolerance, 10) || 70;
+  this._padding = this._translateTo = parseInt(options.padding, 10) || 256;
+  this._orientation = options.side === 'right' ? -1 : 1;
+  this._translateTo *= this._orientation;
+
+  // Init touch events
+  if (this._touch) {
+    this._initTouchEvents();
+  }
+}
+
+/**
+ * Inherits from Emitter
+ */
+inherits(Slideout, Emitter);
+
+/**
+ * Opens the slideout menu.
+ */
+Slideout.prototype.open = function() {
+  var self = this;
+  this.emit('beforeopen');
+  if (html.className.search('slideout-open') === -1) { html.className += ' slideout-open'; }
+  this._setTransition();
+  this._translateXTo(this._translateTo);
+  this._opened = true;
+  setTimeout(function() {
+    self.panel.style.transition = self.panel.style['-webkit-transition'] = '';
+    self.emit('open');
+  }, this._duration + 50);
+  return this;
+};
+
+/**
+ * Closes slideout menu.
+ */
+Slideout.prototype.close = function() {
+  var self = this;
+  if (!this.isOpen() && !this._opening) { return this; }
+  this.emit('beforeclose');
+  this._setTransition();
+  this._translateXTo(0);
+  this._opened = false;
+  setTimeout(function() {
+    html.className = html.className.replace(/ slideout-open/, '');
+    self.panel.style.transition = self.panel.style['-webkit-transition'] = self.panel.style[prefix + 'transform'] = self.panel.style.transform = '';
+    self.emit('close');
+  }, this._duration + 50);
+  return this;
+};
+
+/**
+ * Toggles (open/close) slideout menu.
+ */
+Slideout.prototype.toggle = function() {
+  return this.isOpen() ? this.close() : this.open();
+};
+
+/**
+ * Returns true if the slideout is currently open, and false if it is closed.
+ */
+Slideout.prototype.isOpen = function() {
+  return this._opened;
+};
+
+/**
+ * Translates panel and updates currentOffset with a given X point
+ */
+Slideout.prototype._translateXTo = function(translateX) {
+  this._currentOffsetX = translateX;
+  this.panel.style[prefix + 'transform'] = this.panel.style.transform = 'translate3d(' + translateX + 'px, 0, 0)';
+};
+
+/**
+ * Set transition properties
+ */
+Slideout.prototype._setTransition = function() {
+  this.panel.style[prefix + 'transition'] = this.panel.style.transition = prefix + 'transform ' + this._duration + 'ms ' + this._fx;
+};
+
+/**
+ * Initializes touch event
+ */
+Slideout.prototype._initTouchEvents = function() {
+  var self = this;
+
+  /**
+   * Decouple scroll event
+   */
+  this._onScrollFn = decouple(doc, 'scroll', function() {
+    if (!self._moved) {
+      clearTimeout(scrollTimeout);
+      scrolling = true;
+      scrollTimeout = setTimeout(function() {
+        scrolling = false;
+      }, 250);
+    }
+  });
+
+  /**
+   * Prevents touchmove event if slideout is moving
+   */
+  this._preventMove = function(eve) {
+    if (self._moved) {
+      eve.preventDefault();
+    }
+  };
+  doc.addEventListener(touch.move, this._preventMove);
+
+  /**
+   * Resets values on touchstart
+   */
+  this._resetTouchFn = function(eve) {
+    if (typeof eve.touches === 'undefined') { return; }
+
+    self._moved = false;
+    self._opening = false;
+    self._startOffsetX = eve.touches[0].pageX;
+    self._preventOpen = (!self._touch || (!self.isOpen() && self.menu.clientWidth !== 0));
+  };
+  this.panel.addEventListener(touch.start, this._resetTouchFn);
+
+  /**
+   * Resets values on touchcancel
+   */
+  this._onTouchCancelFn = function() {
+    self._moved = false;
+    self._opening = false;
+  };
+  this.panel.addEventListener('touchcancel', this._onTouchCancelFn);
+
+  /**
+   * Toggles slideout on touchend
+   */
+  this._onTouchEndFn = function() {
+    if (self._moved) {
+      (self._opening && Math.abs(self._currentOffsetX) > self._tolerance) ? self.open() : self.close();
+    }
+    self._moved = false;
+  };
+  this.panel.addEventListener(touch.end, this._onTouchEndFn);
+
+  /**
+   * Translates panel on touchmove
+   */
+  this._onTouchMoveFn = function(eve) {
+  	self.emit('touchmove', eve.target);
+    if (scrolling || self._preventOpen || typeof eve.touches === 'undefined') { return; }
+
+    var dif_x = eve.touches[0].clientX - self._startOffsetX;
+    var translateX = self._currentOffsetX = dif_x;
+
+    if (Math.abs(translateX) > self._padding) { return; }
+
+    if (Math.abs(dif_x) > 20) {
+      self._opening = true;
+
+      var oriented_dif_x = dif_x * self._orientation;
+      if (self._opened && oriented_dif_x > 0 || !self._opened && oriented_dif_x < 0) { return; }
+      if (oriented_dif_x <= 0) {
+        translateX = dif_x + self._padding * self._orientation;
+        self._opening = false;
+      }
+
+      if (!self._moved && html.className.search('slideout-open') === -1) {
+        html.className += ' slideout-open';
+      }
+
+      self.panel.style[prefix + 'transform'] = self.panel.style.transform = 'translate3d(' + translateX + 'px, 0, 0)';
+      self.emit('translate', translateX, eve.target);
+      self._moved = true;
+    }
+
+  };
+  this.panel.addEventListener(touch.move, this._onTouchMoveFn);
+};
+
+Slideout.prototype.enableTouch = function() {
+  this._touch = true;
+  return this;
+};
+
+Slideout.prototype.disableTouch = function() {
+  this._touch = false;
+  return this;
+};
+
+Slideout.prototype.destroy = function() {
+  // Close before clean
+  this.close();
+
+  // Remove event listeners
+  doc.removeEventListener(touch.move, this._preventMove);
+  this.panel.removeEventListener(touch.start, this._resetTouchFn);
+  this.panel.removeEventListener('touchcancel', this._onTouchCancelFn);
+  this.panel.removeEventListener(touch.end, this._onTouchEndFn);
+  this.panel.removeEventListener(touch.move, this._onTouchMoveFn);
+  doc.removeEventListener('scroll', this._onScrollFn);
+
+  // Remove methods
+  this.open = this.close = function() {};
+
+  // Return the instance so it can be easily dereferenced
+  return this;
+};
+
+/**
+ * Expose Slideout
+ */
+module.exports = Slideout;
+
+},{"decouple":2,"emitter":3}],2:[function(require,module,exports){
+'use strict';
+
+var requestAnimFrame = (function() {
+  return window.requestAnimationFrame ||
+    window.webkitRequestAnimationFrame ||
+    function (callback) {
+      window.setTimeout(callback, 1000 / 60);
+    };
+}());
+
+function decouple(node, event, fn) {
+  var eve,
+      tracking = false;
+
+  function captureEvent(e) {
+    eve = e;
+    track();
+  }
+
+  function track() {
+    if (!tracking) {
+      requestAnimFrame(update);
+      tracking = true;
+    }
+  }
+
+  function update() {
+    fn.call(node, eve);
+    tracking = false;
+  }
+
+  node.addEventListener(event, captureEvent, false);
+  return captureEvent;
+}
+
+/**
+ * Expose decouple
+ */
+module.exports = decouple;
+
+},{}],3:[function(require,module,exports){
+"use strict";
+
+var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } };
+
+exports.__esModule = true;
+/**
+ * Creates a new instance of Emitter.
+ * @class
+ * @returns {Object} Returns a new instance of Emitter.
+ * @example
+ * // Creates a new instance of Emitter.
+ * var Emitter = require('emitter');
+ *
+ * var emitter = new Emitter();
+ */
+
+var Emitter = (function () {
+  function Emitter() {
+    _classCallCheck(this, Emitter);
+  }
+
+  /**
+   * Adds a listener to the collection for the specified event.
+   * @memberof! Emitter.prototype
+   * @function
+   * @param {String} event - The event name.
+   * @param {Function} listener - A listener function to add.
+   * @returns {Object} Returns an instance of Emitter.
+   * @example
+   * // Add an event listener to "foo" event.
+   * emitter.on('foo', listener);
+   */
+
+  Emitter.prototype.on = function on(event, listener) {
+    // Use the current collection or create it.
+    this._eventCollection = this._eventCollection || {};
+
+    // Use the current collection of an event or create it.
+    this._eventCollection[event] = this._eventCollection[event] || [];
+
+    // Appends the listener into the collection of the given event
+    this._eventCollection[event].push(listener);
+
+    return this;
+  };
+
+  /**
+   * Adds a listener to the collection for the specified event that will be called only once.
+   * @memberof! Emitter.prototype
+   * @function
+   * @param {String} event - The event name.
+   * @param {Function} listener - A listener function to add.
+   * @returns {Object} Returns an instance of Emitter.
+   * @example
+   * // Will add an event handler to "foo" event once.
+   * emitter.once('foo', listener);
+   */
+
+  Emitter.prototype.once = function once(event, listener) {
+    var self = this;
+
+    function fn() {
+      self.off(event, fn);
+      listener.apply(this, arguments);
+    }
+
+    fn.listener = listener;
+
+    this.on(event, fn);
+
+    return this;
+  };
+
+  /**
+   * Removes a listener from the collection for the specified event.
+   * @memberof! Emitter.prototype
+   * @function
+   * @param {String} event - The event name.
+   * @param {Function} listener - A listener function to remove.
+   * @returns {Object} Returns an instance of Emitter.
+   * @example
+   * // Remove a given listener.
+   * emitter.off('foo', listener);
+   */
+
+  Emitter.prototype.off = function off(event, listener) {
+
+    var listeners = undefined;
+
+    // Defines listeners value.
+    if (!this._eventCollection || !(listeners = this._eventCollection[event])) {
+      return this;
+    }
+
+    listeners.forEach(function (fn, i) {
+      if (fn === listener || fn.listener === listener) {
+        // Removes the given listener.
+        listeners.splice(i, 1);
+      }
+    });
+
+    // Removes an empty event collection.
+    if (listeners.length === 0) {
+      delete this._eventCollection[event];
+    }
+
+    return this;
+  };
+
+  /**
+   * Execute each item in the listener collection in order with the specified data.
+   * @memberof! Emitter.prototype
+   * @function
+   * @param {String} event - The name of the event you want to emit.
+   * @param {...Object} data - Data to pass to the listeners.
+   * @returns {Object} Returns an instance of Emitter.
+   * @example
+   * // Emits the "foo" event with 'param1' and 'param2' as arguments.
+   * emitter.emit('foo', 'param1', 'param2');
+   */
+
+  Emitter.prototype.emit = function emit(event) {
+    var _this = this;
+
+    for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      args[_key - 1] = arguments[_key];
+    }
+
+    var listeners = undefined;
+
+    // Defines listeners value.
+    if (!this._eventCollection || !(listeners = this._eventCollection[event])) {
+      return this;
+    }
+
+    // Clone listeners
+    listeners = listeners.slice(0);
+
+    listeners.forEach(function (fn) {
+      return fn.apply(_this, args);
+    });
+
+    return this;
+  };
+
+  return Emitter;
+})();
+
+/**
+ * Exports Emitter
+ */
+exports["default"] = Emitter;
+module.exports = exports["default"];
+},{}]},{},[1])(1)
+});
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["node_modules/browserify/node_modules/browser-pack/_prelude.js","index.js","node_modules/decouple/index.js","node_modules/emitter/dist/index.js"],"names":[],"mappings":"AAAA;ACAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AC7RA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;ACvCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA","file":"generated.js","sourceRoot":"","sourcesContent":["(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})","'use strict';\n\n/**\n * Module dependencies\n */\nvar decouple = require('decouple');\nvar Emitter = require('emitter');\n\n/**\n * Privates\n */\nvar scrollTimeout;\nvar scrolling = false;\nvar doc = window.document;\nvar html = doc.documentElement;\nvar msPointerSupported = window.navigator.msPointerEnabled;\nvar touch = {\n  'start': msPointerSupported ? 'MSPointerDown' : 'touchstart',\n  'move': msPointerSupported ? 'MSPointerMove' : 'touchmove',\n  'end': msPointerSupported ? 'MSPointerUp' : 'touchend'\n};\nvar prefix = (function prefix() {\n  var regex = /^(Webkit|Khtml|Moz|ms|O)(?=[A-Z])/;\n  var styleDeclaration = doc.getElementsByTagName('script')[0].style;\n  for (var prop in styleDeclaration) {\n    if (regex.test(prop)) {\n      return '-' + prop.match(regex)[0].toLowerCase() + '-';\n    }\n  }\n  // Nothing found so far? Webkit does not enumerate over the CSS properties of the style object.\n  // However (prop in style) returns the correct value, so we'll have to test for\n  // the precence of a specific property\n  if ('WebkitOpacity' in styleDeclaration) { return '-webkit-'; }\n  if ('KhtmlOpacity' in styleDeclaration) { return '-khtml-'; }\n  return '';\n}());\nfunction extend(destination, from) {\n  for (var prop in from) {\n    if (from[prop]) {\n      destination[prop] = from[prop];\n    }\n  }\n  return destination;\n}\nfunction inherits(child, uber) {\n  child.prototype = extend(child.prototype || {}, uber.prototype);\n}\n\n/**\n * Slideout constructor\n */\nfunction Slideout(options) {\n  options = options || {};\n\n  // Sets default values\n  this._startOffsetX = 0;\n  this._currentOffsetX = 0;\n  this._opening = false;\n  this._moved = false;\n  this._opened = false;\n  this._preventOpen = false;\n  this._touch = options.touch === undefined ? true : options.touch && true;\n\n  // Sets panel\n  this.panel = options.panel;\n  this.menu = options.menu;\n\n  // Sets  classnames\n  if(this.panel.className.search('slideout-panel') === -1) { this.panel.className += ' slideout-panel'; }\n  if(this.menu.className.search('slideout-menu') === -1) { this.menu.className += ' slideout-menu'; }\n\n\n  // Sets options\n  this._fx = options.fx || 'ease';\n  this._duration = parseInt(options.duration, 10) || 300;\n  this._tolerance = parseInt(options.tolerance, 10) || 70;\n  this._padding = this._translateTo = parseInt(options.padding, 10) || 256;\n  this._orientation = options.side === 'right' ? -1 : 1;\n  this._translateTo *= this._orientation;\n\n  // Init touch events\n  if (this._touch) {\n    this._initTouchEvents();\n  }\n}\n\n/**\n * Inherits from Emitter\n */\ninherits(Slideout, Emitter);\n\n/**\n * Opens the slideout menu.\n */\nSlideout.prototype.open = function() {\n  var self = this;\n  this.emit('beforeopen');\n  if (html.className.search('slideout-open') === -1) { html.className += ' slideout-open'; }\n  this._setTransition();\n  this._translateXTo(this._translateTo);\n  this._opened = true;\n  setTimeout(function() {\n    self.panel.style.transition = self.panel.style['-webkit-transition'] = '';\n    self.emit('open');\n  }, this._duration + 50);\n  return this;\n};\n\n/**\n * Closes slideout menu.\n */\nSlideout.prototype.close = function() {\n  var self = this;\n  if (!this.isOpen() && !this._opening) { return this; }\n  this.emit('beforeclose');\n  this._setTransition();\n  this._translateXTo(0);\n  this._opened = false;\n  setTimeout(function() {\n    html.className = html.className.replace(/ slideout-open/, '');\n    self.panel.style.transition = self.panel.style['-webkit-transition'] = self.panel.style[prefix + 'transform'] = self.panel.style.transform = '';\n    self.emit('close');\n  }, this._duration + 50);\n  return this;\n};\n\n/**\n * Toggles (open/close) slideout menu.\n */\nSlideout.prototype.toggle = function() {\n  return this.isOpen() ? this.close() : this.open();\n};\n\n/**\n * Returns true if the slideout is currently open, and false if it is closed.\n */\nSlideout.prototype.isOpen = function() {\n  return this._opened;\n};\n\n/**\n * Translates panel and updates currentOffset with a given X point\n */\nSlideout.prototype._translateXTo = function(translateX) {\n  this._currentOffsetX = translateX;\n  this.panel.style[prefix + 'transform'] = this.panel.style.transform = 'translate3d(' + translateX + 'px, 0, 0)';\n};\n\n/**\n * Set transition properties\n */\nSlideout.prototype._setTransition = function() {\n  this.panel.style[prefix + 'transition'] = this.panel.style.transition = prefix + 'transform ' + this._duration + 'ms ' + this._fx;\n};\n\n/**\n * Initializes touch event\n */\nSlideout.prototype._initTouchEvents = function() {\n  var self = this;\n\n  /**\n   * Decouple scroll event\n   */\n  this._onScrollFn = decouple(doc, 'scroll', function() {\n    if (!self._moved) {\n      clearTimeout(scrollTimeout);\n      scrolling = true;\n      scrollTimeout = setTimeout(function() {\n        scrolling = false;\n      }, 250);\n    }\n  });\n\n  /**\n   * Prevents touchmove event if slideout is moving\n   */\n  this._preventMove = function(eve) {\n    if (self._moved) {\n      eve.preventDefault();\n    }\n  };\n  doc.addEventListener(touch.move, this._preventMove);\n\n  /**\n   * Resets values on touchstart\n   */\n  this._resetTouchFn = function(eve) {\n    if (typeof eve.touches === 'undefined') { return; }\n\n    self._moved = false;\n    self._opening = false;\n    self._startOffsetX = eve.touches[0].pageX;\n    self._preventOpen = (!self._touch || (!self.isOpen() && self.menu.clientWidth !== 0));\n  };\n  this.panel.addEventListener(touch.start, this._resetTouchFn);\n\n  /**\n   * Resets values on touchcancel\n   */\n  this._onTouchCancelFn = function() {\n    self._moved = false;\n    self._opening = false;\n  };\n  this.panel.addEventListener('touchcancel', this._onTouchCancelFn);\n\n  /**\n   * Toggles slideout on touchend\n   */\n  this._onTouchEndFn = function() {\n    if (self._moved) {\n      (self._opening && Math.abs(self._currentOffsetX) > self._tolerance) ? self.open() : self.close();\n    }\n    self._moved = false;\n  };\n  this.panel.addEventListener(touch.end, this._onTouchEndFn);\n\n  /**\n   * Translates panel on touchmove\n   */\n  this._onTouchMoveFn = function(eve) {\n\n    if (scrolling || self._preventOpen || typeof eve.touches === 'undefined') { return; }\n\n    var dif_x = eve.touches[0].clientX - self._startOffsetX;\n    var translateX = self._currentOffsetX = dif_x;\n\n    if (Math.abs(translateX) > self._padding) { return; }\n\n    if (Math.abs(dif_x) > 20) {\n      self._opening = true;\n\n      var oriented_dif_x = dif_x * self._orientation;\n      if (self._opened && oriented_dif_x > 0 || !self._opened && oriented_dif_x < 0) { return; }\n      if (oriented_dif_x <= 0) {\n        translateX = dif_x + self._padding * self._orientation;\n        self._opening = false;\n      }\n\n      if (!self._moved && html.className.search('slideout-open') === -1) {\n        html.className += ' slideout-open';\n      }\n\n      self.panel.style[prefix + 'transform'] = self.panel.style.transform = 'translate3d(' + translateX + 'px, 0, 0)';\n      self.emit('translate', translateX);\n      self._moved = true;\n    }\n\n  };\n  this.panel.addEventListener(touch.move, this._onTouchMoveFn);\n};\n\nSlideout.prototype.enableTouch = function() {\n  this._touch = true;\n  return this;\n};\n\nSlideout.prototype.disableTouch = function() {\n  this._touch = false;\n  return this;\n};\n\nSlideout.prototype.destroy = function() {\n  // Close before clean\n  this.close();\n\n  // Remove event listeners\n  doc.removeEventListener(touch.move, this._preventMove);\n  this.panel.removeEventListener(touch.start, this._resetTouchFn);\n  this.panel.removeEventListener('touchcancel', this._onTouchCancelFn);\n  this.panel.removeEventListener(touch.end, this._onTouchEndFn);\n  this.panel.removeEventListener(touch.move, this._onTouchMoveFn);\n  doc.removeEventListener('scroll', this._onScrollFn);\n\n  // Remove methods\n  this.open = this.close = function() {};\n  \n  // Return the instance so it can be easily dereferenced  \n  return this;\n};\n\n/**\n * Expose Slideout\n */\nmodule.exports = Slideout;\n","'use strict';\n\nvar requestAnimFrame = (function() {\n  return window.requestAnimationFrame ||\n    window.webkitRequestAnimationFrame ||\n    function (callback) {\n      window.setTimeout(callback, 1000 / 60);\n    };\n}());\n\nfunction decouple(node, event, fn) {\n  var eve,\n      tracking = false;\n\n  function captureEvent(e) {\n    eve = e;\n    track();\n  }\n\n  function track() {\n    if (!tracking) {\n      requestAnimFrame(update);\n      tracking = true;\n    }\n  }\n\n  function update() {\n    fn.call(node, eve);\n    tracking = false;\n  }\n\n  node.addEventListener(event, captureEvent, false);\n  return captureEvent;\n}\n\n/**\n * Expose decouple\n */\nmodule.exports = decouple;\n","\"use strict\";\n\nvar _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError(\"Cannot call a class as a function\"); } };\n\nexports.__esModule = true;\n/**\n * Creates a new instance of Emitter.\n * @class\n * @returns {Object} Returns a new instance of Emitter.\n * @example\n * // Creates a new instance of Emitter.\n * var Emitter = require('emitter');\n *\n * var emitter = new Emitter();\n */\n\nvar Emitter = (function () {\n  function Emitter() {\n    _classCallCheck(this, Emitter);\n  }\n\n  /**\n   * Adds a listener to the collection for the specified event.\n   * @memberof! Emitter.prototype\n   * @function\n   * @param {String} event - The event name.\n   * @param {Function} listener - A listener function to add.\n   * @returns {Object} Returns an instance of Emitter.\n   * @example\n   * // Add an event listener to \"foo\" event.\n   * emitter.on('foo', listener);\n   */\n\n  Emitter.prototype.on = function on(event, listener) {\n    // Use the current collection or create it.\n    this._eventCollection = this._eventCollection || {};\n\n    // Use the current collection of an event or create it.\n    this._eventCollection[event] = this._eventCollection[event] || [];\n\n    // Appends the listener into the collection of the given event\n    this._eventCollection[event].push(listener);\n\n    return this;\n  };\n\n  /**\n   * Adds a listener to the collection for the specified event that will be called only once.\n   * @memberof! Emitter.prototype\n   * @function\n   * @param {String} event - The event name.\n   * @param {Function} listener - A listener function to add.\n   * @returns {Object} Returns an instance of Emitter.\n   * @example\n   * // Will add an event handler to \"foo\" event once.\n   * emitter.once('foo', listener);\n   */\n\n  Emitter.prototype.once = function once(event, listener) {\n    var self = this;\n\n    function fn() {\n      self.off(event, fn);\n      listener.apply(this, arguments);\n    }\n\n    fn.listener = listener;\n\n    this.on(event, fn);\n\n    return this;\n  };\n\n  /**\n   * Removes a listener from the collection for the specified event.\n   * @memberof! Emitter.prototype\n   * @function\n   * @param {String} event - The event name.\n   * @param {Function} listener - A listener function to remove.\n   * @returns {Object} Returns an instance of Emitter.\n   * @example\n   * // Remove a given listener.\n   * emitter.off('foo', listener);\n   */\n\n  Emitter.prototype.off = function off(event, listener) {\n\n    var listeners = undefined;\n\n    // Defines listeners value.\n    if (!this._eventCollection || !(listeners = this._eventCollection[event])) {\n      return this;\n    }\n\n    listeners.forEach(function (fn, i) {\n      if (fn === listener || fn.listener === listener) {\n        // Removes the given listener.\n        listeners.splice(i, 1);\n      }\n    });\n\n    // Removes an empty event collection.\n    if (listeners.length === 0) {\n      delete this._eventCollection[event];\n    }\n\n    return this;\n  };\n\n  /**\n   * Execute each item in the listener collection in order with the specified data.\n   * @memberof! Emitter.prototype\n   * @function\n   * @param {String} event - The name of the event you want to emit.\n   * @param {...Object} data - Data to pass to the listeners.\n   * @returns {Object} Returns an instance of Emitter.\n   * @example\n   * // Emits the \"foo\" event with 'param1' and 'param2' as arguments.\n   * emitter.emit('foo', 'param1', 'param2');\n   */\n\n  Emitter.prototype.emit = function emit(event) {\n    var _this = this;\n\n    for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {\n      args[_key - 1] = arguments[_key];\n    }\n\n    var listeners = undefined;\n\n    // Defines listeners value.\n    if (!this._eventCollection || !(listeners = this._eventCollection[event])) {\n      return this;\n    }\n\n    // Clone listeners\n    listeners = listeners.slice(0);\n\n    listeners.forEach(function (fn) {\n      return fn.apply(_this, args);\n    });\n\n    return this;\n  };\n\n  return Emitter;\n})();\n\n/**\n * Exports Emitter\n */\nexports[\"default\"] = Emitter;\nmodule.exports = exports[\"default\"];"]}
\ No newline at end of file
diff --git a/lib/persona.js b/lib/persona.js
index 7fd9e07..1bef4b8 100644
--- a/lib/persona.js
+++ b/lib/persona.js
@@ -92,6 +92,8 @@ $(document).ready(function() {
 			return;
 		}
 
+		$('#menu').removeClass('hidden');
+
 		var slideout = new Slideout({
 			'panel': document.getElementById('panel'),
 			'menu': document.getElementById('menu'),
@@ -101,7 +103,6 @@ $(document).ready(function() {
 		});
 
 		$('#mobile-menu').on('click', function() {
-			$('#menu').show();
 			slideout.toggle();
 		});
 
@@ -109,11 +110,7 @@ $(document).ready(function() {
 			slideout.close();
 		});
 
-		$(window).on('resize', function() {
-			slideout.close();
-		});
-
-		$(window).on('action:ajaxify.start', function() {
+		$(window).on('resize action:ajaxify.start', function() {
 			slideout.close();
 		});
 
@@ -123,8 +120,6 @@ $(document).ready(function() {
 		}
 
 		function openingMenu() {
-			$('#menu').show();
-
 			$('#header-menu').css({
 				'top': $(window).scrollTop() + 'px',
 				'position': 'absolute'
@@ -140,9 +135,12 @@ $(document).ready(function() {
 			});
 		}
 
-		slideout.on('beforeopen', openingMenuAndLoad);
 		slideout.on('open', openingMenuAndLoad);
-		slideout.on('translate', openingMenu);
+		slideout.on('touchmove', function(target) {
+			if (target && $(target).is('code')) {
+				slideout._preventOpen = true;
+			}
+		});
 
 		slideout.on('close', function() {
 			$('#header-menu').css({
@@ -150,7 +148,6 @@ $(document).ready(function() {
 				'position': 'fixed'
 			});
 			$('.slideout-open').removeClass('slideout-open');
-			$('#menu').hide();
 		});
 
 		$('#menu [data-section="navigation"] ul').html($('#main-nav').html() + ($('#logged-out-menu').html() || ''));
diff --git a/templates/header.tpl b/templates/header.tpl
index d6f9c89..4cdfc04 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -38,7 +38,7 @@
 </head>
 
 <body>
-	<nav id="menu">
+	<nav id="menu" class="hidden">
 		<section class="menu-profile">
 			<img src="{user.picture}"/>
 			<i component="user/status" class="fa fa-fw fa-circle status {user.status}"></i>

From 4a35efea24a50c8731bb4cf9090ce8086965e5ea Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Sat, 3 Oct 2015 17:21:36 -0400
Subject: [PATCH 33/41] #152 for child nodes

---
 lib/persona.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/persona.js b/lib/persona.js
index 1bef4b8..14530bf 100644
--- a/lib/persona.js
+++ b/lib/persona.js
@@ -137,7 +137,8 @@ $(document).ready(function() {
 
 		slideout.on('open', openingMenuAndLoad);
 		slideout.on('touchmove', function(target) {
-			if (target && $(target).is('code')) {
+			var $target = $(target);
+			if ($target.length && ($target.is('code') || $target.parents('code').length)) {
 				slideout._preventOpen = true;
 			}
 		});

From 57ac7180d0ebf6652f2cba142b1d78b9638c4e58 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Sat, 3 Oct 2015 17:22:57 -0400
Subject: [PATCH 34/41] 3.0.35

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

diff --git a/package.json b/package.json
index 1f3b17d..7d86cfa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.34",
+  "version": "3.0.35",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },

From 1fc6d56800435119f8e8122dbecddd92781a4fdf Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Sat, 3 Oct 2015 18:35:24 -0400
Subject: [PATCH 35/41] closes #161

---
 templates/account/edit.tpl                                | 3 ---
 templates/partials/modals/change_picture_modal.tpl        | 8 ++++----
 .../partials/modals/upload_picture_from_url_modal.tpl     | 2 +-
 templates/partials/modals/upload_picture_modal.tpl        | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl
index a84502a..e4bf2c9 100644
--- a/templates/account/edit.tpl
+++ b/templates/account/edit.tpl
@@ -151,8 +151,5 @@
 			<!-- ENDIF sso.length -->
 		</div>
 	</div>
-
-	<!-- IMPORT partials/modals/change_picture_modal.tpl -->
-	<!-- IMPORT partials/modals/upload_picture_from_url_modal.tpl -->
 </div>
 
diff --git a/templates/partials/modals/change_picture_modal.tpl b/templates/partials/modals/change_picture_modal.tpl
index 20435bf..e83a121 100644
--- a/templates/partials/modals/change_picture_modal.tpl
+++ b/templates/partials/modals/change_picture_modal.tpl
@@ -1,4 +1,4 @@
-	<div id="change-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="change-picture" aria-hidden="true">
+	<div id="change-picture-modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="change-picture" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
 				<div class="modal-header">
@@ -31,6 +31,6 @@
 					<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">[[global:close]]</button>
 					<button id="savePictureChangesBtn" class="btn btn-primary">[[global:save_changes]]</button>
 				</div>
-			</div><!-- /.modal-content -->
-		</div><!-- /.modal-dialog -->
-	</div><!-- /.modal -->
\ No newline at end of file
+			</div>
+		</div>
+	</div>
\ No newline at end of file
diff --git a/templates/partials/modals/upload_picture_from_url_modal.tpl b/templates/partials/modals/upload_picture_from_url_modal.tpl
index b8d1222..f2a5545 100644
--- a/templates/partials/modals/upload_picture_from_url_modal.tpl
+++ b/templates/partials/modals/upload_picture_from_url_modal.tpl
@@ -1,4 +1,4 @@
-	<div id="upload-picture-from-url-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="upload-picture-url" aria-hidden="true">
+	<div id="upload-picture-from-url-modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="upload-picture-url" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
 				<div class="modal-header">
diff --git a/templates/partials/modals/upload_picture_modal.tpl b/templates/partials/modals/upload_picture_modal.tpl
index 4a967da..1b919ba 100644
--- a/templates/partials/modals/upload_picture_modal.tpl
+++ b/templates/partials/modals/upload_picture_modal.tpl
@@ -1,4 +1,4 @@
-	<div id="upload-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="upload-picture" aria-hidden="true">
+	<div id="upload-picture-modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="upload-picture" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
 				<div class="modal-header">

From 3ce096b84789fb0ece36825be5bac496a5cc1431 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Sat, 3 Oct 2015 18:37:19 -0400
Subject: [PATCH 36/41] 3.0.36

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

diff --git a/package.json b/package.json
index 7d86cfa..f9f7ed8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.35",
+  "version": "3.0.36",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },

From 52f7a6705021b7efc0a69f502908e46312f6e387 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Sat, 3 Oct 2015 18:51:00 -0400
Subject: [PATCH 37/41] closes #159

---
 less/topic.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/less/topic.less b/less/topic.less
index b9e0f43..45af3c1 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -261,7 +261,7 @@
 			.fix-lists;
 
 			blockquote {
-				font-size: 85%;
+				font-size: 12px;
 			}
 
 			> blockquote {

From f00dcc467731c6a065864884c50e73c9a400ff34 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Sat, 3 Oct 2015 18:54:15 -0400
Subject: [PATCH 38/41] closes #131

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

diff --git a/templates/partials/menu.tpl b/templates/partials/menu.tpl
index 184ef97..31b533f 100644
--- a/templates/partials/menu.tpl
+++ b/templates/partials/menu.tpl
@@ -173,7 +173,7 @@
 					<!-- BEGIN navigation -->
 					<!-- IF function.displayMenuItem, @index -->
 					<li class="{navigation.class}">
-						<a href="{relative_path}{navigation.route}" title="{navigation.title}" id="{navigation.id}"<!-- IF navigation.properties.targetBlank --> target="_blank"<!-- ENDIF navigation.properties.targetBlank -->>
+						<a href="{relative_path}{navigation.route}" title="{navigation.title}" <!-- IF navigation.id -->id="{navigation.id}"<!-- ENDIF navigation.id --><!-- IF navigation.properties.targetBlank --> target="_blank"<!-- ENDIF navigation.properties.targetBlank -->>
 							<!-- IF navigation.iconClass -->
 							<i class="fa fa-fw {navigation.iconClass}"></i>
 							<!-- ENDIF navigation.iconClass -->

From 3b4362e132d26660434fd69a9608dc2e41007a97 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Sat, 3 Oct 2015 18:56:25 -0400
Subject: [PATCH 39/41] 3.0.37

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

diff --git a/package.json b/package.json
index f9f7ed8..ca7e659 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.36",
+  "version": "3.0.37",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },

From 3d0d07977db6bc85158e66601697dd5098dac9ff Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Sun, 4 Oct 2015 01:13:06 -0400
Subject: [PATCH 40/41] https://github.com/NodeBB/NodeBB/issues/3705

---
 templates/partials/topic/post.tpl | 3 ---
 templates/topic.tpl               | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index b3c07c7..c8efe5a 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -65,7 +65,4 @@
 <!-- ENDIF posts.user.signature -->
 
 
-<small data-editor="{posts.editor.userslug}" component="post/editor" class="hidden">[[global:last_edited_by_ago, <strong>{posts.editor.username}</strong>, <span class="timeago" title="{posts.relativeEditTime}"></span>]]</small>
-
-
 <hr />
diff --git a/templates/topic.tpl b/templates/topic.tpl
index 67746df..0c95544 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -19,7 +19,7 @@
 
 	<ul component="topic" class="posts" data-tid="{tid}">
 		<!-- BEGIN posts -->
-			<li component="post" class="clearfix <!-- IF posts.deleted -->deleted<!-- ENDIF posts.deleted -->" <!-- IMPORT partials/data/topic.tpl -->>
+			<li component="post" class="<!-- IF posts.deleted -->deleted<!-- ENDIF posts.deleted -->" <!-- IMPORT partials/data/topic.tpl -->>
 				<a component="post/anchor" data-index="{posts.index}" name="{posts.index}"></a>
 
 				<meta itemprop="datePublished" content="{posts.relativeTime}">

From 9dd5ca3ab5c60ca7528bc0a03b364cb44f0a55af Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Sun, 4 Oct 2015 01:14:28 -0400
Subject: [PATCH 41/41] 3.0.38

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

diff --git a/package.json b/package.json
index ca7e659..99c1140 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.37",
+  "version": "3.0.38",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },