paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 19:31:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

left-sidebar: Remove add-streams option out of scrollbar.

Browse Source 
This commit removes the option to add more streams out of scrollbar
as it is not visible on mobile devices or organizations with large number of
streams until scrolled down.
This commit is contained in:
Gaurav Pandey
2021-03-01 11:03:11 +05:30
committed by Tim Abbott
parent 5192dab31d
commit 7ddf6435a9
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/resize.js
View File

@@ -40,6 +40,7 @@ function get_new_heights() {
const viewport_height = message_viewport.height(); const viewport_height = message_viewport.height();
const top_navbar_height = $("#top_navbar").safeOuterHeight(true); const top_navbar_height = $("#top_navbar").safeOuterHeight(true);
const invite_user_link_height = $("#invite-user-link").safeOuterHeight(true) || 0; const invite_user_link_height = $("#invite-user-link").safeOuterHeight(true) || 0;
const add_streams_link_height = $("#add-stream-link").safeOuterHeight(true) || 0;
res.bottom_whitespace_height = viewport_height * 0.4; res.bottom_whitespace_height = viewport_height * 0.4;
@@ -51,7 +52,8 @@ function get_new_heights() {
Number.parseInt($(".narrows_panel").css("marginTop"), 10) - Number.parseInt($(".narrows_panel").css("marginTop"), 10) -
Number.parseInt($(".narrows_panel").css("marginBottom"), 10) - Number.parseInt($(".narrows_panel").css("marginBottom"), 10) -
$("#global_filters").safeOuterHeight(true) - $("#global_filters").safeOuterHeight(true) -
$("#streams_header").safeOuterHeight(true); $("#streams_header").safeOuterHeight(true) -
add_streams_link_height;
// Don't let us crush the stream sidebar completely out of view // Don't let us crush the stream sidebar completely out of view
res.stream_filters_max_height = Math.max(80, res.stream_filters_max_height); res.stream_filters_max_height = Math.max(80, res.stream_filters_max_height);

3
static/styles/left_sidebar.css
View File

@@ -78,7 +78,7 @@ li.show-more-topics {
#stream_filters { #stream_filters {
overflow: visible; overflow: visible;
margin-bottom: 10px; margin-bottom: 5px;
margin-right: 12px; margin-right: 12px;
padding: 0; padding: 0;
font-weight: normal; font-weight: normal;
@@ -175,7 +175,6 @@ li.show-more-topics {
#add-stream-link { #add-stream-link {
text-decoration: none; text-decoration: none;
margin-left: 10px; margin-left: 10px;
margin-bottom: 18px;
i { i {
min-width: 19px; min-width: 19px;
text-align: center; text-align: center;

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

@@ -82,6 +82,7 @@
</div> </div>
<div id="stream-filters-container" class="scrolling_list" data-simplebar> <div id="stream-filters-container" class="scrolling_list" data-simplebar>
<ul id="stream_filters" class="filters"></ul> <ul id="stream_filters" class="filters"></ul>
</div>
{% if show_add_streams %} {% if show_add_streams %}
<div id="add-stream-link"> <div id="add-stream-link">
<a href="#streams/all"><i class="fa fa-plus-circle" aria-hidden="true"></i>{{ _('Subscribe to more streams') }}</a> <a href="#streams/all"><i class="fa fa-plus-circle" aria-hidden="true"></i>{{ _('Subscribe to more streams') }}</a>
@@ -89,5 +90,4 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div>
</div> </div>