From a0a376e95e78e4c1ac9fb5da30f46cea0b4d0de5 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 14 Mar 2017 18:31:19 +0100
Subject: hide nav search behind a button, css fixes and cleanup

---
 view/js/autocomplete.js | 2 +-
 view/js/main.js         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'view/js')

diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 5a616b6fc..4de9f9c6b 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -60,7 +60,7 @@ function contact_format(item) {
 		var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick);
 		if(typeof desc === 'undefined') desc = '';
 		if(desc) desc = ' ('+desc+')';
-		return "<div class='{0}' title='{4}'><img class='dropdown-menu-img-sm' src='{1}'><span class='contactname'>{2}</span><span class='dropdown-sub-text'>{3}</span><div class='clear'></div></div>".format(item.taggable, item.photo, item.name, desc, item.link);
+		return "<div class='{0} dropdown-item dropdown-notification clearfix' title='{4}'><img class='dropdown-menu-img-sm' src='{1}'><span class='contactname'>{2}</span><span class='dropdown-sub-text'>{3}</span></div>".format(item.taggable, item.photo, item.name, desc, item.link);
 	}
 	else
 		return "<div>" + item.text + "</div>";
diff --git a/view/js/main.js b/view/js/main.js
index db7ad110b..5e3a04abb 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -369,10 +369,10 @@ function NavUpdate() {
 			updateCountsOnly = false;
 
 			if(data.network || data.home || data.intros || data.mail || data.all_events || data.notify) {
-				$('#notifications-btn').css('color', 'white').prop('disabled', false);
+				$('#notifications-btn').removeClass('text-muted').addClass('text-white');
 			}
 			else {
-				$('#notifications-btn').css('color', 'grey').prop('disabled', true);
+				$('#notifications-btn').removeClass('text-white').addClass('text-muted');
 				$('#navbar-collapse-1').removeClass('in');
 			}
 
-- 
cgit v1.2.3