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

right sidebar: Change media cut-off for where we hide the buddy list. 

This was last changed in 88951d6 from 975 to 1025, but I think that wasn't
quite aggressive enough.
This commit is contained in:
Rishi Gupta 2018-09-24 15:02:34 -07:00 committed by showell
parent 7f16d27015
commit 5774300364
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
static/js/message_viewport.js
View File

@ -250,9 +250,9 @@ exports.stop_auto_scrolling = function () {
exports.is_narrow = function () { exports.is_narrow = function () {
// This basically returns true when we hide the right sidebar for // This basically returns true when we hide the right sidebar for
// the left_side_userlist skinny mode. It would be nice to have a less brittle // the left_side_userlist skinny mode. It would be nice to have a less brittle
// test for this. See the "@media (max-width: 1025px)" section in // test for this. See the "@media (max-width: 1165px)" section in
// zulip.css. // media.scss.
return window.innerWidth <= 1025; return window.innerWidth <= 1165;
}; };
exports.system_initiated_animate_scroll = function (scroll_amount) { exports.system_initiated_animate_scroll = function (scroll_amount) {

2
static/js/scroll_bar.js
View File

@ -53,7 +53,7 @@ exports.initialize = function () {
$("#compose-container").css("max-width", 1400 + sbWidth + "px"); $("#compose-container").css("max-width", 1400 + sbWidth + "px");
$('#keyboard-icon').css({right: sbWidth + 13 + "px"}); $('#keyboard-icon').css({right: sbWidth + 13 + "px"});
$("head").append("<style> @media (max-width: 1025px) { .compose-content, .header-main .column-middle { margin-right: " + (7 + sbWidth) + "px !important; } } " + $("head").append("<style> @media (max-width: 1165px) { .compose-content, .header-main .column-middle { margin-right: " + (7 + sbWidth) + "px !important; } } " +
"@media (max-width: 775px) { .fixed-app .column-middle { margin-left: " + (7 + sbWidth) + "px !important; } } " + "@media (max-width: 775px) { .fixed-app .column-middle { margin-left: " + (7 + sbWidth) + "px !important; } } " +
"</style>"); "</style>");
} }

2
static/styles/media.scss
View File

@ -4,7 +4,7 @@
} }
/* This max-width must be synced with message_viewport.is_narrow */ /* This max-width must be synced with message_viewport.is_narrow */
@media (max-width: 1025px) { @media (max-width: 1165px) {
.screen-full-show { .screen-full-show {
display: none !important; display: none !important;
} }

2
templates/zerver/help/move-the-users-list-to-the-left-sidebar.md
View File

@ -1,7 +1,7 @@
# Move the users list to the left sidebar # Move the users list to the left sidebar
By default, the **User list** is displayed in the right sidebar, to the By default, the **User list** is displayed in the right sidebar, to the
right of the main message pane. However, in narrower windows (1025 pixels and right of the main message pane. However, in narrower windows (1165 pixels and
smaller) the right sidebar is hidden to save space. smaller) the right sidebar is hidden to save space.
You can choose to move the **User list** to the left hand side, under the You can choose to move the **User list** to the left hand side, under the