diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-03-14 18:31:19 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-03-14 18:31:19 +0100 |
| commit | a0a376e95e78e4c1ac9fb5da30f46cea0b4d0de5 (patch) | |
| tree | 494ff430a32c8ef06151afa8881b211c79ce0569 /view/js | |
| parent | 7b9df1d40101cff801208b8dbcf8c8c0bc42365e (diff) | |
| download | volse-hubzilla-a0a376e95e78e4c1ac9fb5da30f46cea0b4d0de5.tar.gz volse-hubzilla-a0a376e95e78e4c1ac9fb5da30f46cea0b4d0de5.tar.bz2 volse-hubzilla-a0a376e95e78e4c1ac9fb5da30f46cea0b4d0de5.zip | |
hide nav search behind a button, css fixes and cleanup
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/autocomplete.js | 2 | ||||
| -rw-r--r-- | view/js/main.js | 4 |
2 files changed, 3 insertions, 3 deletions
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'); } |