paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 21:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

left sidebar: Clean up "split" list moves.

Browse Source 
This change only impacts users who have the setting
to put the user lists in the left sidebar when they
have a narrow window.

First, we move ".right-sidebar-items" as an entire
group.

Second, we append the items to "#left-sidebar"
instead of ".narrows_panel".
This commit is contained in:
Steve Howell
2019-02-10 19:36:36 +00:00
committed by Tim Abbott
parent 039daa2bfa
commit c4ac7f5b03
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
static/js/resize.js
View File

@@ -224,13 +224,14 @@ exports.resize_page_components = function () {
$("#top_navbar").removeClass("rightside-userlist");
var right_items = $('.right-sidebar-items').expectOne();
if (css_narrow_mode && !narrow_window) {
// move stuff to the left sidebar (skinny mode)
narrow_window = true;
popovers.set_userlist_placement("left");
sidebar = $(".narrows_panel").expectOne();
sidebar.append($("#user-list").expectOne());
sidebar.append($("#group-pm-list").expectOne());
sidebar = $("#left-sidebar").expectOne();
sidebar.append(right_items);
$("#buddy_list_wrapper").css("margin", "0px");
$("#group-pms").css("margin", "0px");
$("#userlist-toggle").css("display", "none");
@@ -240,8 +241,7 @@ exports.resize_page_components = function () {
narrow_window = false;
popovers.set_userlist_placement("right");
sidebar = $("#right-sidebar").expectOne();
sidebar.append($("#user-list").expectOne());
sidebar.append($("#group-pm-list").expectOne());
sidebar.append(right_items);
$("#buddy_list_wrapper").css("margin", '');
$("#group-pms").css("margin", '');
$("#userlist-toggle").css("display", '');

2
static/styles/right-sidebar.scss
View File

@@ -220,7 +220,7 @@
margin-right: 10px;
}
.sidebar-items:first-of-type #userlist-header {
.right-sidebar-items:first-of-type #userlist-header {
border-top: none;
}

2
templates/zerver/app/right_sidebar.html
View File

@@ -1,5 +1,5 @@
<div class="right-sidebar" id="right-sidebar" role="navigation">
<div class="sidebar-items">
<div class="right-sidebar-items">
{% if enable_feedback %}
<div id="feedback_section" class="new-style">
<button type="button" class="button small rounded" id="feedback_button">