From c62907f304ccaa2cc40ea24c6b326064e66ac9a1 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Mon, 30 May 2022 14:46:46 -0400
Subject: [PATCH] fix: combine notif/chat buttons onto one line

---
 less/header.less            |  7 ++++++-
 templates/partials/menu.tpl | 16 ++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/less/header.less b/less/header.less
index ca83f47..105cd9e 100644
--- a/less/header.less
+++ b/less/header.less
@@ -205,10 +205,15 @@
 		border-top: 1px solid rgba(163, 163, 163, 0.5);
 
 		a {
-			display: block;
 			text-align: center;
 			padding: 0.5em 0.5em;
 			font-weight: 600;
+			color: @dropdown-link-color;
+
+			&:hover {
+				color: @dropdown-link-hover-color;
+				background: @dropdown-link-hover-bg;
+			}
 		}
 	}
 
diff --git a/templates/partials/menu.tpl b/templates/partials/menu.tpl
index 8d25c52..3bf54e3 100644
--- a/templates/partials/menu.tpl
+++ b/templates/partials/menu.tpl
@@ -57,8 +57,12 @@
 									</li>
 								</ul>
 							</li>
-							<li class="notif-dropdown-link"><a href="#" class="mark-all-read">[[notifications:mark_all_read]]</a></li>
-							<li class="notif-dropdown-link"><a href="{relative_path}/notifications">[[notifications:see_all]]</a></li>
+							<li class="notif-dropdown-link">
+								<div class="btn-group btn-group-justified">
+									<a role="button" href="#" class="btn btn-secondary mark-all-read"><i class="fa fa-check-double"></i> [[notifications:mark_all_read]]</a>
+									<a class="btn btn-secondary" href="{relative_path}/notifications"><i class="fa fa-list"></i> [[notifications:see_all]]</a>
+								</div>
+							</li>
 						</ul>
 					</li>
 
@@ -75,8 +79,12 @@
 									</li>
 								</ul>
 							</li>
-							<li class="notif-dropdown-link"><a href="#" class="mark-all-read" component="chats/mark-all-read">[[modules:chat.mark_all_read]]</a></li>
-							<li class="notif-dropdown-link"><a href="{relative_path}/user/{user.userslug}/chats">[[modules:chat.see_all]]</a></li>
+							<li class="notif-dropdown-link">
+								<div class="btn-group btn-group-justified">
+									<a class="btn btn-secondary mark-all-read" href="#" component="chats/mark-all-read"><i class="fa fa-check-double"></i> [[modules:chat.mark_all_read]]</a>
+									<a class="btn btn-secondary" href="{relative_path}/user/{user.userslug}/chats"><i class="fa fa-comments"></i> [[modules:chat.see_all]]</a>
+								</div>
+							</li>
 						</ul>
 					</li>
 					<!-- ENDIF canChat -->