From b71efdf9a58ad95d350604c36b5dd070fbdfd9c3 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Fri, 22 Feb 2019 15:21:50 -0500
Subject: [PATCH 01/17] fix: removed left padding in breadcrumb

---
 less/header.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/less/header.less b/less/header.less
index 1bcc828..74e9fd0 100644
--- a/less/header.less
+++ b/less/header.less
@@ -269,7 +269,6 @@
 
 	font-size: 16px;
 	padding: 0;
-	padding-left: 0.5em;
 	background: none;
 
 	@media (max-width: @screen-xs-max) {

From f2cdf1bf33593bf02be10328d08f27349cf5094e Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Fri, 22 Feb 2019 15:21:53 -0500
Subject: [PATCH 02/17] 9.1.20

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

diff --git a/package.json b/package.json
index c06dc6b..538aad0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "9.1.19",
+  "version": "9.1.20",
   "nbbpm": {
     "compatibility": "^1.12.0"
   },

From db767c95ce033b5ac4c6d8984315cf1c227a8a6d Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 22 Feb 2019 15:30:31 -0500
Subject: [PATCH 03/17] fix titles getting cutoff

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

diff --git a/less/topic.less b/less/topic.less
index 622dc73..a63f80b 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -11,7 +11,7 @@
 			word-wrap: break-word;
 			font-size: 28px;
 			color:inherit;
-			line-height: 32px;
+			line-height: 36px;
 			overflow: hidden;
 		}
 

From e613abb08afd76833d9228c128f305a4b0478809 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 22 Feb 2019 15:30:54 -0500
Subject: [PATCH 04/17] 9.1.21

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

diff --git a/package.json b/package.json
index 538aad0..8460ec4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "9.1.20",
+  "version": "9.1.21",
   "nbbpm": {
     "compatibility": "^1.12.0"
   },

From 8c17089082cfccf50e6f405247a017f551870ca4 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 22 Feb 2019 15:47:28 -0500
Subject: [PATCH 05/17] remove hr on last element

---
 templates/partials/quick-search-results.tpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/partials/quick-search-results.tpl b/templates/partials/quick-search-results.tpl
index 5556923..0c2932f 100644
--- a/templates/partials/quick-search-results.tpl
+++ b/templates/partials/quick-search-results.tpl
@@ -17,7 +17,9 @@
         </small>
      </a>
 </li>
+<!-- IF !@last -->
 <li role="separator" class="divider"></li>
+<!-- ENDIF -->
 <!-- END posts -->
 <!-- IF multiplePages -->
 <li class="text-center">

From 39ec5024b2cda3abb3523dc3e7e69e301866e27a Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 22 Feb 2019 15:47:55 -0500
Subject: [PATCH 06/17] 9.1.22

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

diff --git a/package.json b/package.json
index 8460ec4..adc36f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "9.1.21",
+  "version": "9.1.22",
   "nbbpm": {
     "compatibility": "^1.12.0"
   },

From e0328d0f371e964a2aaf8fa1b98ed1be64ce01e1 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Mon, 25 Feb 2019 10:24:10 -0500
Subject: [PATCH 07/17] closes #467

---
 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 45cb5d6..cf0cde7 100644
--- a/templates/partials/menu.tpl
+++ b/templates/partials/menu.tpl
@@ -191,7 +191,7 @@
 
 				<ul class="nav navbar-nav navbar-right hidden-xs">
 					<li>
-						<a href="#" id="reconnect" class="hide" title="Connection to {config.siteTitle} has been lost, attempting to reconnect...">
+						<a href="#" id="reconnect" class="hide" title="[[global:reconnecting-message, {config.siteTitle}]]">
 							<i class="fa fa-check"></i>
 						</a>
 					</li>

From 917b1d652f0e7a32bba465e385e5a2f3f87cd5fc Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Mon, 25 Feb 2019 10:24:14 -0500
Subject: [PATCH 08/17] 9.1.23

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

diff --git a/package.json b/package.json
index adc36f9..3c80c05 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "9.1.22",
+  "version": "9.1.23",
   "nbbpm": {
     "compatibility": "^1.12.0"
   },

From 1f79ff4de9ae9239292044d59c0bfebdf30166ce Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 28 Feb 2019 17:47:40 -0500
Subject: [PATCH 09/17] fix: single sign-on buttons should have middle vertical
 alignment

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

diff --git a/less/style.less b/less/style.less
index 7093d12..13a035f 100644
--- a/less/style.less
+++ b/less/style.less
@@ -46,7 +46,7 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
 	list-style-type: none;
 
 	li {
-		vertical-align: top;
+		vertical-align: middle;
 		background: transparent;
 		margin: 0.25em;
 		.pointer;

From 8b5e8373fdd7518dfdf944e6ef2990275767f884 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 28 Feb 2019 17:47:44 -0500
Subject: [PATCH 10/17] 9.1.24

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

diff --git a/package.json b/package.json
index 3c80c05..2b24bd2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "9.1.23",
+  "version": "9.1.24",
   "nbbpm": {
     "compatibility": "^1.12.0"
   },

From 77962c81bab538f6cd82c98451019da0c7a6d391 Mon Sep 17 00:00:00 2001
From: Sebastian Sycz <sebastiansycz99@icloud.com>
Date: Sun, 3 Mar 2019 17:09:19 +0100
Subject: [PATCH 11/17] fix not showing IPs (#468)

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

diff --git a/templates/account/profile.tpl b/templates/account/profile.tpl
index 4950a2f..477f442 100644
--- a/templates/account/profile.tpl
+++ b/templates/account/profile.tpl
@@ -128,7 +128,7 @@
 			</div>
 			<div class="panel-body">
 			<!-- BEGIN ips -->
-				<div>{ips.ip}</div>
+				<div>{ips}</div>
 			<!-- END ips -->
 			</div>
 		</div>

From ea3e7a2661d7b3f150073bd485004352cbdf5d6e Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Sat, 9 Mar 2019 12:31:22 -0500
Subject: [PATCH 12/17] https://github.com/NodeBB/NodeBB/issues/7358

---
 templates/groups/details.tpl       | 12 +++++++++---
 templates/partials/topic/badge.tpl |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/templates/groups/details.tpl b/templates/groups/details.tpl
index 3971725..2b1c9e7 100644
--- a/templates/groups/details.tpl
+++ b/templates/groups/details.tpl
@@ -175,12 +175,18 @@
 
 					<div class="form-group user-title-option">
 						<label>[[groups:details.badge_preview]]</label><br />
-						<span class="label<!-- IF !group.userTitleEnabled --> hide<!-- ENDIF !group.userTitleEnabled -->" style="background-color: {group.labelColor}"><i class="fa<!-- IF group.icon --> {group.icon}<!-- ENDIF group.icon -->"></i> <!-- IF group.userTitle -->{group.userTitle}<!-- ELSE -->{group.displayName}<!-- ENDIF group.userTitle --></span>
-
+						<span class="label<!-- IF !group.userTitleEnabled --> hide<!-- ENDIF !group.userTitleEnabled -->" style="color: {group.textColor}; background-color: {group.labelColor}"><i class="fa<!-- IF group.icon --> {group.icon}<!-- ENDIF group.icon -->"></i> <!-- IF group.userTitle -->{group.userTitle}<!-- ELSE -->{group.displayName}<!-- ENDIF group.userTitle --></span>
+						<hr/>
 						<button component="groups/userTitleOption" type="button" class="btn btn-default btn-sm" data-action="icon-select"<!-- IF !group.userTitleEnabled --> disabled<!-- ENDIF !group.userTitleEnabled -->>[[groups:details.change_icon]]</button>
-						<button component="groups/userTitleOption" type="button" class="btn btn-default btn-sm" data-action="color-select"<!-- IF !group.userTitleEnabled --> disabled<!-- ENDIF !group.userTitleEnabled -->>[[groups:details.change_colour]]</button>
+
+						<button component="groups/userTitleOption" type="button" class="btn btn-default btn-sm" data-action="label-color-select"<!-- IF !group.userTitleEnabled --> disabled<!-- ENDIF !group.userTitleEnabled -->>[[groups:details.change_label_colour]]</button>
+
+						<button component="groups/userTitleOption" type="button" class="btn btn-default btn-sm" data-action="text-color-select"<!-- IF !group.userTitleEnabled --> disabled<!-- ENDIF !group.userTitleEnabled -->>[[groups:details.change_text_colour]]</button>
+
 						<input type="hidden" name="labelColor" value="<!-- IF group.labelColor -->{group.labelColor}<!-- ENDIF group.labelColor -->" />
+						<input type="hidden" name="textColor" value="<!-- IF group.textColor -->{group.textColor}<!-- ENDIF group.textColor -->" />
 						<input type="hidden" name="icon" value="<!-- IF group.icon -->{group.icon}<!-- ENDIF group.icon -->" />
+
 						<div id="icons" class="hidden">
 							<div class="icon-container">
 								<div class="row fa-icons">
diff --git a/templates/partials/topic/badge.tpl b/templates/partials/topic/badge.tpl
index 28590e0..5290506 100644
--- a/templates/partials/topic/badge.tpl
+++ b/templates/partials/topic/badge.tpl
@@ -1,5 +1,5 @@
 <!-- BEGIN posts.user.selectedGroups -->
 <!-- IF posts.user.selectedGroups.slug -->
-<a href="{config.relative_path}/groups/{posts.user.selectedGroups.slug}"><small class="label group-label inline-block" style="background-color: {posts.user.selectedGroups.labelColor};"><!-- IF posts.user.selectedGroups.icon --><i class="fa {posts.user.selectedGroups.icon}"></i> <!-- ENDIF posts.user.selectedGroups.icon -->{posts.user.selectedGroups.userTitle}</small></a>
+<a href="{config.relative_path}/groups/{posts.user.selectedGroups.slug}"><small class="label group-label inline-block" style="color:{posts.user.selectedGroups.textColor};background-color: {posts.user.selectedGroups.labelColor};"><!-- IF posts.user.selectedGroups.icon --><i class="fa {posts.user.selectedGroups.icon}"></i> <!-- ENDIF posts.user.selectedGroups.icon -->{posts.user.selectedGroups.userTitle}</small></a>
 <!-- ENDIF posts.user.selectedGroups.slug -->
 <!-- END posts.user.selectedGroups -->
\ No newline at end of file

From 17629360b1dcf8418b0581e478d886dc8f1daaa1 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Sat, 9 Mar 2019 12:36:27 -0500
Subject: [PATCH 13/17] 9.1.25

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

diff --git a/package.json b/package.json
index 2b24bd2..99cbe98 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "9.1.24",
+  "version": "9.1.25",
   "nbbpm": {
     "compatibility": "^1.12.0"
   },

From 67a69db90715734353953bb58b09af5f900b22e2 Mon Sep 17 00:00:00 2001
From: Andrew Rodrigues <psycho.bunny@hotmail.com>
Date: Tue, 12 Mar 2019 17:52:06 -0400
Subject: [PATCH 14/17] fix: https://github.com/NodeBB/NodeBB/issues/7446

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

diff --git a/templates/partials/quick-search-results.tpl b/templates/partials/quick-search-results.tpl
index 0c2932f..eb6ab9a 100644
--- a/templates/partials/quick-search-results.tpl
+++ b/templates/partials/quick-search-results.tpl
@@ -1,6 +1,6 @@
 <!-- BEGIN posts -->
 <li>
-    <a href="/post/{posts.pid}">
+    <a href="{config.relative_path}/post/{posts.pid}">
         <!-- IF posts.user.picture -->
         <img title="{posts.user.username}" class="avatar avatar-sm avatar-rounded" src="{posts.user.picture}" />
         <!-- ELSE -->

From 8a818164008154a13ec1c71e7862a1e2245dcd6f Mon Sep 17 00:00:00 2001
From: Andrew Rodrigues <psycho.bunny@hotmail.com>
Date: Tue, 12 Mar 2019 17:52:12 -0400
Subject: [PATCH 15/17] 9.1.26

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

diff --git a/package.json b/package.json
index 99cbe98..6955438 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "9.1.25",
+  "version": "9.1.26",
   "nbbpm": {
     "compatibility": "^1.12.0"
   },

From fa32d014c5d0bff3feeed1571618997c76fa440d Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Wed, 13 Mar 2019 13:24:06 -0400
Subject: [PATCH 16/17] fix: overflow on long group names, nodebb/nodebb#7447

---
 less/groups.less | 27 +++++++++++++++++++++++++++
 less/topic.less  |  7 -------
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/less/groups.less b/less/groups.less
index c47778e..1aadbba 100644
--- a/less/groups.less
+++ b/less/groups.less
@@ -1,3 +1,15 @@
+.group-label {
+	display: inline-block;
+	text-transform: uppercase;
+	vertical-align: middle;
+	padding: 4px;
+	border-radius: 2px;
+	max-width: 150px;
+	overflow-x: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
 .groups.details {
 	margin-top: 200px;
 
@@ -104,6 +116,11 @@
 		}
 	}
 
+	h1 {
+		overflow-wrap: break-word;
+		margin-top: 0;
+	}
+
 	.owner-controls {
 		margin-top: -6px;
 	}
@@ -133,6 +150,12 @@
 			padding: .2em .3em .1em;
 		}
 	}
+
+	.options {
+		.user-title-option span.label {
+			.group-label;
+		}
+	}
 }
 
 .groups.list {
@@ -155,6 +178,10 @@
 				color: white;
 				font-weight: bold;
 				text-transform: capitalize;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				overflow-x: hidden;
+				max-width: 100%;
 			}
 		}
 
diff --git a/less/topic.less b/less/topic.less
index a63f80b..4085536 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -96,13 +96,6 @@
 		.status {
 			vertical-align: 0%;
 		}
-
-		.group-label {
-			text-transform: uppercase;
-			vertical-align: 5%;
-			padding: 4px;
-			border-radius: 2px;
-		}
 	}
 
 	.bookmarked {

From be0267430ddd57dfcdc552bdc2e00655d9da2a44 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Wed, 13 Mar 2019 13:24:10 -0400
Subject: [PATCH 17/17] 9.1.27

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

diff --git a/package.json b/package.json
index 6955438..77f3aca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "9.1.26",
+  "version": "9.1.27",
   "nbbpm": {
     "compatibility": "^1.12.0"
   },