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

Move groups (not just users) from right to left sidebar. 

When a user squishes the browser window enough to move users
to the left sidebar, we need to move user groups as well.  More
importantly, when they widen again, we move both of them back
in a way that users stay on top of groups.

(imported from commit d80722b58190d42a2dfc5247bfffaa7708cde21a)
This commit is contained in:
Steve Howell 2013-11-13 11:50:32 -05:00
parent a2df5f18e9
commit b7d8f5d43f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/ui.js
View File

@ -436,8 +436,10 @@ exports.resize_page_components = function () {
popovers.set_userlist_placement("left"); popovers.set_userlist_placement("left");
sidebar = $(".bottom_sidebar").expectOne(); sidebar = $(".bottom_sidebar").expectOne();
sidebar.append($("#user-list").expectOne()); sidebar.append($("#user-list").expectOne());
sidebar.append($("#group-pm-list").expectOne());
sidebar.append($("#share-the-love").expectOne()); sidebar.append($("#share-the-love").expectOne());
$("#user_presences").css("margin", "0px"); $("#user_presences").css("margin", "0px");
$("#group-pms").css("margin", "0px");
$("#userlist-toggle").css("display", "none"); $("#userlist-toggle").css("display", "none");
} }
else if (viewport.width() > 975 && feature_flags.left_side_userlist && narrow_window) { else if (viewport.width() > 975 && feature_flags.left_side_userlist && narrow_window) {
@ -445,7 +447,9 @@ exports.resize_page_components = function () {
popovers.set_userlist_placement("right"); popovers.set_userlist_placement("right");
sidebar = $("#right-sidebar").expectOne(); sidebar = $("#right-sidebar").expectOne();
sidebar.append($("#user-list").expectOne()); sidebar.append($("#user-list").expectOne());
sidebar.append($("#group-pm-list").expectOne());
$("#user_presences").css("margin", ''); $("#user_presences").css("margin", '');
$("#group-pms").css("margin", '');
$("#userlist-toggle").css("display", ''); $("#userlist-toggle").css("display", '');
} }