diff options
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/view/js/main.js b/view/js/main.js index 5de4aa9a2..38b9754a1 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').css('opacity', 1); } else { - $('#notifications-btn').css('color', 'grey').prop('disabled', true); + $('#notifications-btn').css('opacity', 0.5); $('#navbar-collapse-1').removeClass('in'); } @@ -695,7 +695,7 @@ function collapseHeight() { $(".wall-item-content, .directory-collapse").each(function() { var orgHeight = $(this).outerHeight(true); if(orgHeight > divmore_height) { - if(! $(this).hasClass('divmore')) { + if(! $(this).hasClass('divmore') && $(this).has('div.no-collapse').length == 0) { // check if we will collapse some content above the visible content and compensate the diff later if($(this).offset().top + divmore_height - $(window).scrollTop() + cDiff - ($(".divgrow-showmore").outerHeight() * i) < 65) { @@ -939,6 +939,8 @@ function notify_popup_loader(notifyType) { window.location.href=window.location.href; } + console.log(data); + if(data.notify.length == 0){ $("#nav-" + notifyType + "-menu").html(aStr[nothingnew]); } else { |