From b44e9d69ad31c7f1e2ff6e4ef5302d81be4e93c4 Mon Sep 17 00:00:00 2001
From: Daisuke <rednapx@gmail.com>
Date: Sat, 25 Sep 2021 11:30:50 -0500
Subject: [PATCH] 250921 Re-enable bookmarks and styleshet fix

---
 css/style.css        | 4 ++++
 layout/header.php    | 3 ---
 modules/timeline.php | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/css/style.css b/css/style.css
index 1001a9d..1f9b1a5 100644
--- a/css/style.css
+++ b/css/style.css
@@ -20,6 +20,10 @@ p {
 	margin: 0px !important;
 }
 
+.content p {
+    margin-bottom: 1em !important;	
+}
+
 body {
 	margin: 0;
 }
diff --git a/layout/header.php b/layout/header.php
index a928444..0581400 100644
--- a/layout/header.php
+++ b/layout/header.php
@@ -105,12 +105,9 @@ if ($logedin) {
 		<span class="topbutton" style='position:relative;'>
 			<a href='?mode=direct' class='fontello topicon tlicon ldr <?php echo ($tl['mode'] == "direct" ? "tiselected" : "");?>'>&#xf0e0;</a>
 		</span>
-		
-		<?php if (isset($user_settings['pleroma'])): ?>
 		<span class="topbutton" style='position:relative;'>
 			<a href='?mode=bookmarks' class='fontello topicon tlicon ldr <?php echo ($tl['mode'] == "bookmarks" ? "tiselected" : "");?>'>&#xe81e;</a>
 		</span>
-		<?php endif; ?>
 	</span>
 	<?php endif; ?>
 
diff --git a/modules/timeline.php b/modules/timeline.php
index 2ede4d6..7efa817 100644
--- a/modules/timeline.php
+++ b/modules/timeline.php
@@ -208,7 +208,7 @@ if ((!isset($thread[0]['id']) && !empty($thread)) || !is_array($thread)) {
 			$post['menu'] .= ($elem['account']['id'] != $user_settings['uid'] ? "<li><a href='?action=mute&user=" . $elem['account']['id'] . "' onClick='return false;' class='mute fontello' id='" . $elem['account']['id'] . "' style='background-color:transparent;'>&#xe81b; Mute User</a></li>" : "");
 			$post['menu'] .= ($elem['account']['id'] != $user_settings['uid'] ? "<li><a href='?action=mute&thread=" . $elem['account']['id'] . "' onClick='return false;' class='muteconv fontello' id='" . $elem['id'] . "' style='background-color:transparent;'>&#xf1f7; Drop Thread</a></li>" : "");
 			$post['menu'] .= (isset($user_settings['pleroma']) ? "<li><a href='?action=hide&thread=" . $elem['pleroma']['conversation_id'] . "' onClick='return false;' class='hide fontello' id='" . $elem['pleroma']['conversation_id'] . "' style='background-color:transparent;'>&#xf1f8; Hide Thread</a></li>" : "");
-			$post['menu'] .= (isset($user_settings['pleroma']) ? "<li><a href='?action=bookmark&thread=" . $elem['account']['id'] . "' onClick='return false;' class='" . ($elem['bookmarked'] == true ? "un" : "") . "bookmark fontello' id='" . $elem['id'] . "' style='background-color:transparent;'>&#xe81e; " . ($elem['bookmarked'] == true ? "Unb" : "B") . "ookmark</a></li>" : "");
+			$post['menu'] .= "<li><a href='?action=bookmark&thread=" . $elem['account']['id'] . "' onClick='return false;' class='" . ($elem['bookmarked'] == true ? "un" : "") . "bookmark fontello' id='" . $elem['id'] . "' style='background-color:transparent;'>&#xe81e; " . ($elem['bookmarked'] == true ? "Unb" : "B") . "ookmark</a></li>";
 			$post['menu'] .= ($elem['account']['id'] != $user_settings['uid'] ? "<li><a href='?action=nsfw&user=" . $elem['account']['id'] . "' onClick='return false;' class='nsfw fontello' id='" . $elem['account']['id'] . "' style='background-color:transparent;'>&#xe829; User is NSFW</a></li>" : "");
 		}
 		$post['menu'] .= "<li><a target='_blank' href='" . $elem['url'] . "' class='original link fontello'  style='background-color:transparent;'>&#xf14c; Original Note</a></li>";