From 36fa7956b598cbc882770b1f711ba3ed3d52f0aa Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sat, 30 Sep 2017 01:22:35 -0300
Subject: [PATCH] Merge pull request #8361 from RocketChat/mentions-badge

[NEW] Unify unread and mentions badge
---
 .../rocketchat-theme/client/imports/components/badge.css     | 3 +--
 packages/rocketchat-ui-sidenav/client/sidebarItem.html       | 5 +----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/badge.css b/packages/rocketchat-theme/client/imports/components/badge.css
index b8c73374510c..b3fbeb8e1637 100644
--- a/packages/rocketchat-theme/client/imports/components/badge.css
+++ b/packages/rocketchat-theme/client/imports/components/badge.css
@@ -11,8 +11,7 @@
 
 	font-size: var(--badge-text-size);
 
-	&--unread,
-	&--mention {
+	&--unread {
 		background-color: var(--badge-unread-background);
 	}
 }
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.html b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
index 334877a74426..3ac3cd8ede1a 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.html
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
@@ -16,11 +16,8 @@
 				{{/if}}
 			</div>
 			<div class='sidebar-item__name {{archivedClass}}'>{{name}}</div>
-			{{#if userMentions}}
-				<span class="badge badge--mention">@</span>
-			{{/if}}
 			{{#if unread}}
-				<span class="badge badge--unread">{{unread}}</span>
+				<span class="badge badge--unread">{{#if userMentions}}@ {{/if}}{{unread}}</span>
 			{{/if}}
 			{{#if isRoom}}
 				<div class="sidebar-item__menu">