From 05fa8930a327e414a6c6ffa785cbbec0600e7180 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Sun, 24 Sep 2017 22:29:11 -0300
Subject: [PATCH] fix color on unread messages

---
 .../imports/components/sidebar/sidebar-item.css    | 14 --------------
 .../rocketchat-ui-sidenav/client/chatRoomItem.js   |  6 +-----
 .../rocketchat-ui-sidenav/client/sidebarItem.html  |  4 ++--
 .../rocketchat-ui-sidenav/client/sidebarItem.js    |  6 ++++++
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index 0a1db558e83d..2e2368783b65 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -48,20 +48,6 @@
 		}
 	}
 
-	&--darken {
-		&:hover {
-			background-color: var(--sidebar-item-darken-hover-background);
-		}
-
-		& .sidebar-item__link {
-			color: var(--sidebar-item-darken-text-color);
-		}
-	}
-
-	&--lighten:hover {
-		background-color: var(--sidebar-item-lighten-hover-background);
-	}
-
 	&__popup-active {
 		background-color: var(--sidebar-item-popup-background);
 	}
diff --git a/packages/rocketchat-ui-sidenav/client/chatRoomItem.js b/packages/rocketchat-ui-sidenav/client/chatRoomItem.js
index 8cf4df405cdc..cc8dabdce6ef 100644
--- a/packages/rocketchat-ui-sidenav/client/chatRoomItem.js
+++ b/packages/rocketchat-ui-sidenav/client/chatRoomItem.js
@@ -19,10 +19,7 @@ Template.chatRoomItem.helpers({
 
 		const archivedClass = this.archived ? 'archived' : false;
 
-		let alertClass = false;
-		if (!this.hideUnreadStatus && (FlowRouter.getParam('_id') !== this.rid || !document.hasFocus()) && this.alert) {
-			alertClass = 'sidebar-item__link--active';
-		}
+		this.alert = !this.hideUnreadStatus && (FlowRouter.getParam('_id') !== this.rid || !document.hasFocus()) && this.alert;
 
 		const icon = RocketChat.roomTypes.getIcon(this.t);
 		const avatar = !icon;
@@ -37,7 +34,6 @@ Template.chatRoomItem.helpers({
 			unread,
 			active,
 			archivedClass,
-			alertClass,
 			statusClass: this.t === 'd' ? Session.get(`user_${ this.name }_status`) || 'offline' : this.t === 'l' ? RocketChat.roomTypes.getUserStatus(this.t, this.rid) || 'offline' : false
 		};
 	}
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.html b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
index 4f0ad5b36f49..3eeb96ea2d78 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.html
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.html
@@ -1,9 +1,9 @@
 <template name="sidebarItem">
-	<li class="sidebar-item {{#if unread}}sidebar-item--unread{{/if}} {{#if active}}sidebar-item--active{{/if}} {{#if toolbar}}popup-item{{/if}}" data-id="{{_id}}">
+	<li class="sidebar-item {{#if or unread alert }}sidebar-item--unread{{/if}} {{#if active}}sidebar-item--active{{/if}} {{#if toolbar}}popup-item{{/if}}" data-id="{{_id}}">
 		{{#if statusClass}}
 			<div class="sidebar-item__user-status sidebar-item__user-status--{{statusClass}}"></div>
 		{{/if}}
-		<a class="sidebar-item__link {{alertClass}} {{#if active}}sidebar-item__link--active{{/if}}" href="{{#if route}}{{route}}{{else}}{{pathFor pathSection group=pathGroup}}{{/if}}" title="{{name}}">
+		<a class="sidebar-item__link" href="{{#if route}}{{route}}{{else}}{{pathFor pathSection group=pathGroup}}{{/if}}" title="{{name}}">
 			<div class="sidebar-item__picture">
 				{{#if icon}}
 					{{> icon block="sidebar-item__icon" icon=icon}}
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarItem.js b/packages/rocketchat-ui-sidenav/client/sidebarItem.js
index 7505ffce3d4e..84b20d41dcfd 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarItem.js
+++ b/packages/rocketchat-ui-sidenav/client/sidebarItem.js
@@ -1,4 +1,10 @@
 /* globals menu popover */
+Template.sidebarItem.helpers({
+	or(...args) {
+		args.pop();
+		return args.some(arg => arg);
+	}
+});
 Template.sidebarItem.events({
 	'click [data-id], click .sidebar-item__link'() {
 		return menu.close();