From aa33cacb62ef25cbab7c6ee1b253ed58072e6e44 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 15 Mar 2017 16:42:55 +0100
Subject: style hashtags, mentions and categories. hide expand-aside button if
 not needed. css and class fixes

---
 include/text.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'include/text.php')

diff --git a/include/text.php b/include/text.php
index 9d76f9d78..2d1bc4222 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1460,10 +1460,7 @@ function format_hashtags(&$item) {
 			if(strpos($item['body'], $t['url']))
 				continue;
 
-			if($s)
-				$s .= '&nbsp';
-
-			$s .= '#<a href="' . zid($t['url']) . '" >' . $term . '</a>';
+			$s .= '<span class="badge badge-pill badge-info"><i class="fa fa-hashtag"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span> ';
 		}
 	}
 
@@ -1484,10 +1481,7 @@ function format_mentions(&$item) {
 			if(strpos($item['body'], $t['url']))
 				continue;
 
-			if($s)
-				$s .= '&nbsp';
-
-			$s .= '@<a href="' . zid($t['url']) . '" >' . $term . '</a>';
+			$s .= '<span class="badge badge-pill badge-success"><i class="fa fa-at"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span> ';
 		}
 	}
 
-- 
cgit v1.2.3


From a73ea134cd09af039e01e4f6ae7f455ecb76279e Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 15 Mar 2017 21:22:16 +0100
Subject: re-add spaces between tags

---
 include/text.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'include/text.php')

diff --git a/include/text.php b/include/text.php
index 2d1bc4222..224ba17d0 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1459,8 +1459,10 @@ function format_hashtags(&$item) {
 				continue;
 			if(strpos($item['body'], $t['url']))
 				continue;
+			if($s)
+				$s .= ' ';
 
-			$s .= '<span class="badge badge-pill badge-info"><i class="fa fa-hashtag"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span> ';
+			$s .= '<span class="badge badge-pill badge-info"><i class="fa fa-hashtag"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span>';
 		}
 	}
 
@@ -1480,8 +1482,9 @@ function format_mentions(&$item) {
 				continue;
 			if(strpos($item['body'], $t['url']))
 				continue;
-
-			$s .= '<span class="badge badge-pill badge-success"><i class="fa fa-at"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span> ';
+			if($s)
+				$s .= ' ';
+			$s .= '<span class="badge badge-pill badge-success"><i class="fa fa-at"></i>&nbsp;<a class="text-white" href="' . zid($t['url']) . '" >' . $term . '</a></span>';
 		}
 	}
 
-- 
cgit v1.2.3