Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Have the stream list and user list share the sidebar. 

This isn't perfect, because if, e.g. the stream list is super short,
it still takes up lots of space that the user list might want to use,
but it's an acceptable first pass solution, in my view.

(imported from commit 669737d769258c089b40ffea4abee3229902e857)
This commit is contained in:
Waseem Daher 2013-02-12 10:18:22 -05:00
parent 7975b36a45
commit 55b05d7bd2
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -243,7 +243,11 @@ function resizehandler(e) {
$("#main_div").css('min-height', viewport.height() - $("#top_navbar").height());
/* total viewport - height of navbar - height of upper sidebar - padding*/
$(".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);
$("#stream_filters").css('max-height', bottom_sidebar_height * 0.35);
$("#user_presences").css('max-height', bottom_sidebar_height * 0.35);
// This function might run onReady (if we're in a narrow window),
// but before we've loaded in the messages; in that case, don't

13
zephyr/static/styles/zephyr.css
View File

@ -78,9 +78,20 @@ a:hover code {
.bottom_sidebar {
margin-top: 1em;
}
#stream_filters {
overflow-y: hidden;
}
.bottom_sidebar:hover {
#stream_filters:hover {
overflow-y: auto;
}
#user_presences {
margin-top: 1em;
overflow-y: hidden;
}
#user_presences:hover {
overflow-y: auto;
}