Zulip server and web application. Open-source team chat that helps teams stay productive and focused.
settings: Align subscriber/member table header layout with org tables.
Sahil Batraa0efd767f7cc
diff --git a/web/styles/subscriptions.css b/web/styles/subscriptions.cssindex c2f2adb6f22..e8437f1b2c3 100644--- a/web/styles/subscriptions.css+++ b/web/styles/subscriptions.css@@ -198,6 +198,11 @@ h3.user_group_setting_subsection_title {}}+.subscribers-list-header .search,+.members-list-header .search {+ max-width: 160px;+}+.add-group-member-loading-spinner {align-self: center;}@@ -343,23 +348,6 @@ h3.user_group_setting_subsection_title {}}-.member-search,-.subscriber-search {- margin: 10px 0 0;-- .search {- max-width: 160px;- }-- @media (max-width: $ms_min) {- float: none;- display: flex;- justify-content: flex-start;- align-items: center;- margin: 0 0 5px;- }-}-.add_subscriber_button_wrapper,.add_member_button_wrapper {display: grid;@@ -1246,20 +1234,8 @@ h3.user_group_setting_subsection_title {}}- .create_user_group_member_list_header,- .create_stream_subscriber_list_header {- margin-top: 10px;- margin-bottom: 3px;-- & h5 {- display: inline-block;- }- }-.add-user-list-filter {width: 140px;- float: right;- margin-top: 10px;}#user_group_creation_form,diff --git a/web/templates/stream_settings/new_stream_users.hbs b/web/templates/stream_settings/new_stream_users.hbsindex df9a7828f26..79bd2f98d96 100644--- a/web/templates/stream_settings/new_stream_users.hbs+++ b/web/templates/stream_settings/new_stream_users.hbs@@ -11,13 +11,15 @@{{/tr}}</div>-<div class="create_stream_subscriber_list_header">+<div class="settings_panel_list_header create_stream_subscriber_list_header"><div class="subscribers-heading"><h3 class="stream_setting_subsection_title">{{t 'Subscribers preview' }}</h3><div class="add-subscriber-loading-spinner"></div></div>- <input class="add-user-list-filter filter_text_input" name="user_list_filter" type="text"- autocomplete="off" placeholder="{{t 'Filter' }}" />+ <div class="user_filters">+ <input class="add-user-list-filter filter_text_input" name="user_list_filter" type="text"+ autocomplete="off" placeholder="{{t 'Filter' }}" />+ </div></div><div class="subscriber-list-box">diff --git a/web/templates/stream_settings/stream_members.hbs b/web/templates/stream_settings/stream_members.hbsindex c81a53eb9aa..c838e9141f1 100644--- a/web/templates/stream_settings/stream_members.hbs+++ b/web/templates/stream_settings/stream_members.hbs@@ -23,14 +23,14 @@label=(t "Send notification message to newly subscribed users")}}</div>- <div class="subscribers-list-header">+ <div class="settings_panel_list_header subscribers-list-header"><div class="subscribers-heading"><h3 class="stream_setting_subsection_title">{{t "Subscribers"}}</h3><div class="add-subscriber-loading-spinner"></div></div>- <span class="subscriber-search float-right">+ <div class="user_filters"><input type="text" class="search filter_text_input" placeholder="{{t 'Filter' }}" />- </span>+ </div></div><div class="subscriber-list-box">{{> stream_members_table .}}diff --git a/web/templates/user_group_settings/new_user_group_users.hbs b/web/templates/user_group_settings/new_user_group_users.hbsindex 68125a0ea4d..0d757abae53 100644--- a/web/templates/user_group_settings/new_user_group_users.hbs+++ b/web/templates/user_group_settings/new_user_group_users.hbs@@ -12,10 +12,12 @@{{/tr}}</div>-<div class="create_user_group_member_list_header">+<div class="settings_panel_list_header create_user_group_member_list_header"><h3 class="user_group_setting_subsection_title">{{t 'Members preview' }}</h3>- <input class="add-user-list-filter filter_text_input" name="user_list_filter" type="text"- autocomplete="off" placeholder="{{t 'Filter' }}" />+ <div class="user_filters">+ <input class="add-user-list-filter filter_text_input" name="user_list_filter" type="text"+ autocomplete="off" placeholder="{{t 'Filter' }}" />+ </div></div><div class="add-group-member-loading-spinner"></div>diff --git a/web/templates/user_group_settings/user_group_members.hbs b/web/templates/user_group_settings/user_group_members.hbsindex 22879c36545..b6658cede9f 100644--- a/web/templates/user_group_settings/user_group_members.hbs+++ b/web/templates/user_group_settings/user_group_members.hbs@@ -22,11 +22,11 @@{{/tr}}</div>{{/unless}}- <div class="members-list-header">+ <div class="settings_panel_list_header members-list-header"><h3 class="user_group_setting_subsection_title">{{t "Members"}}</h3>- <span class="member-search float-right">+ <div class="user_filters"><input type="text" class="search filter_text_input" placeholder="{{t 'Filter' }}" />- </span>+ </div></div><div class="add-group-member-loading-spinner"></div><div class="member-list-box">