paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-26 09:34:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

inbox: Remove empty space below filters for hidden folders.

Browse Source 
Hidden folders occupied space due to bottom margin.

Fixed by moving the margin to elements which have `display: none`
property so that margin is removed.

(cherry picked from commit 39b560e611)
This commit is contained in:
Aman Agrawal
2025-09-05 12:24:31 +05:30
committed by Tim Abbott
parent 2d203f1743
commit 55bd5c0aeb
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web/styles/inbox.css
View File

@@ -645,11 +645,19 @@
.inbox-folder-components { .inbox-folder-components {
border-radius: 5px; border-radius: 5px;
border: 0.5px solid hsl(0deg 0% 0% / 13%); border: 0.5px solid hsl(0deg 0% 0% / 13%);
/* 8px at 16px / 1em */
margin-bottom: 0.5em;
overflow: hidden; overflow: hidden;
} }
.inbox-folder-components
.inbox-folder-channel:last-child
.inbox-topic-container,
#inbox-direct-messages-container {
.inbox-row:last-child {
/* 8px at 16px / 1em */
margin-bottom: 0.5em;
}
}
.inbox-folder.inbox-collapsed-state, .inbox-folder.inbox-collapsed-state,
.inbox-folder.hidden_by_filters { .inbox-folder.hidden_by_filters {
+ .inbox-folder-components { + .inbox-folder-components {

2
web/templates/inbox_view/inbox_folder_with_channels.hbs
View File

@@ -11,7 +11,7 @@
{{#each topics_dict as |key_value_list _index|}} {{#each topics_dict as |key_value_list _index|}}
{{#each ../streams_dict as |stream_key_value _stream_index|}} {{#each ../streams_dict as |stream_key_value _stream_index|}}
{{#if (and (eq stream_key_value.[1].folder_id ../../id) (eq stream_key_value.[0] key_value_list.[0]))}} {{#if (and (eq stream_key_value.[1].folder_id ../../id) (eq stream_key_value.[0] key_value_list.[0]))}}
<div id="{{key_value_list.[0]}}"> <div id="{{key_value_list.[0]}}" class="inbox-folder-channel">
{{> inbox_row stream_key_value.[1]}} {{> inbox_row stream_key_value.[1]}}
<div class="inbox-topic-container"> <div class="inbox-topic-container">
{{#each key_value_list.[1]}} {{#each key_value_list.[1]}}