paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-09 16:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't have the presence list occlude the "More messages" popup.

Browse Source 
The issue, prior to this fix, is that the presence list actually
gets drawn *on top of* our "more messages" popup, which is ugly.

(Toggling the z-index on either or both of them did not seem
 necessarily to matter, but that's probably because z-index
 is subtler than I understand.)

This fixes Trac #1078.

(imported from commit a255aadb1884cf6c659085b26a36d378f680e83e)
This commit is contained in:
Waseem Daher
2013-03-11 23:10:02 -04:00
parent 039178b12e
commit dffde7714c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zephyr/static/js/ui.js
View File

@@ -234,7 +234,9 @@ function resizehandler(e) {
/* total viewport - height of navbar - height of upper sidebar - padding*/ /* total viewport - height of navbar - height of upper sidebar - padding*/
var bottom_sidebar_height = viewport.height() - $("#top_navbar").height() - $(".upper_sidebar").height() - 40; var bottom_sidebar_height = viewport.height() - $("#top_navbar").height() - $(".upper_sidebar").height() - 40;
$(".bottom_sidebar").height(bottom_sidebar_height); $(".bottom_sidebar").height(bottom_sidebar_height);
var right_sidebar_height = viewport.height() - $("#top_navbar").height(); /* viewport - navbar - notifications area - margin on the right-sidebar - padding on the notifications-bar */
var right_sidebar_height = viewport.height() - $("#top_navbar").height() - $("#notifications-area").height() - 14 - 10;
$("#right-sidebar").height(right_sidebar_height);
$("#stream_filters").css('max-height', bottom_sidebar_height * 0.75); $("#stream_filters").css('max-height', bottom_sidebar_height * 0.75);
$("#user_presences").css('max-height', right_sidebar_height * 0.90); $("#user_presences").css('max-height', right_sidebar_height * 0.90);