Skip to content

armgit / zulip

Public Imported from GitHub
0

Zulip server and web application. Open-source team chat that helps teams stay productive and focused.

settings: Wrap remaining subsection headings in subsection-header.

Sahil Batraeb438c9adc41
diff --git a/web/templates/stream_settings/channel_permissions.hbs b/web/templates/stream_settings/channel_permissions.hbs
index 245f292dc88..0f5f1422ef5 100644
--- a/web/templates/stream_settings/channel_permissions.hbs
+++ b/web/templates/stream_settings/channel_permissions.hbs
@@ -1,5 +1,5 @@
<div id="channel-subscription-permissions" class="settings-subsection-parent">
- <div class="channel-subscription-permissions-title-container {{#if is_stream_edit}}subsection-header{{/if}}">
+ <div class="subsection-header">
<h3 class="stream_setting_subsection_title">{{t "Subscription management"}}</h3>
{{#if is_stream_edit}}
{{> ../settings/settings_save_discard_widget section_name="subscription-permissions" show_save_discard_buttons=true}}
@@ -54,7 +54,7 @@
</div>
<div id="channel-messaging-permissions" class="settings-subsection-parent">
- <div class="channel-messaging-permissions-title-container {{#if is_stream_edit}}subsection-header{{/if}}">
+ <div class="subsection-header">
<h3 class="stream_setting_subsection_title">{{t "Messaging permissions"}}</h3>
{{#if is_stream_edit}}
{{> ../settings/settings_save_discard_widget section_name="messaging-permissions" show_save_discard_buttons=true}}
@@ -83,7 +83,7 @@
</div>
<div id="channel-moderation-permissions" class="settings-subsection-parent">
- <div class="channel-moderation-permissions-title-container {{#if is_stream_edit}}subsection-header{{/if}}">
+ <div class="subsection-header">
<h3 class="stream_setting_subsection_title">{{t "Moderation permissions"}}</h3>
{{#if is_stream_edit}}
{{> ../settings/settings_save_discard_widget section_name="moderation-permissions" show_save_discard_buttons=true}}
@@ -117,7 +117,7 @@
</div>
<div id="channel-administrative-permissions" class="settings-subsection-parent">
- <div class="channel-administrative-permissions-title-container {{#if is_stream_edit}}subsection-header{{/if}}">
+ <div class="subsection-header">
<h3 class="stream_setting_subsection_title">{{t "Administrative permissions"}}</h3>
{{#if is_stream_edit}}
{{> ../settings/settings_save_discard_widget section_name="administrative-permissions" show_save_discard_buttons=true}}
diff --git a/web/templates/stream_settings/stream_creation_form.hbs b/web/templates/stream_settings/stream_creation_form.hbs
index a1d589a97db..1666c8a3668 100644
--- a/web/templates/stream_settings/stream_creation_form.hbs
+++ b/web/templates/stream_settings/stream_creation_form.hbs
@@ -32,9 +32,11 @@
</div>
<div class="subscribers_container stream_creation_container">
<section class="stream_create_add_subscriber_container">
- <h3 class="stream_setting_subsection_title new-stream-subscribers-title">
- <label class="choose-subscribers-label">{{t "Choose subscribers" }}</label>
- </h3>
+ <div class="subsection-header">
+ <h3 class="stream_setting_subsection_title new-stream-subscribers-title">
+ <label class="choose-subscribers-label">{{t "Choose subscribers" }}</label>
+ </h3>
+ </div>
<div id="stream_subscription_error" class="stream_creation_error"></div>
<div class="controls" id="people_to_add"></div>
</section>
diff --git a/web/templates/stream_settings/stream_members.hbs b/web/templates/stream_settings/stream_members.hbs
index 2ab8f337c03..c81a53eb9aa 100644
--- a/web/templates/stream_settings/stream_members.hbs
+++ b/web/templates/stream_settings/stream_members.hbs
@@ -1,7 +1,9 @@
<div class="subscriber_list_settings_container no-display">
- <h3 class="stream_setting_subsection_title add-subscribers-heading">
- {{t "Add subscribers" }}
- </h3>
+ <div class="subsection-header add-subscribers-heading">
+ <h3 class="stream_setting_subsection_title">
+ {{t "Add subscribers" }}
+ </h3>
+ </div>
<div class="stream_subscription_request_result banner-wrapper"></div>
{{> add_subscribers_form .}}
<div class="add-subscribers-subtitle">
diff --git a/web/templates/user_group_settings/user_group_creation_form.hbs b/web/templates/user_group_settings/user_group_creation_form.hbs
index 8e67501572c..9411ca82cf5 100644
--- a/web/templates/user_group_settings/user_group_creation_form.hbs
+++ b/web/templates/user_group_settings/user_group_creation_form.hbs
@@ -35,9 +35,11 @@
</div>
<div class="user_group_members_container user_group_creation">
<section id="choose_member_section">
- <h3 class="user_group_setting_subsection_title">
- <label for="people_to_add_in_group">{{t "Choose members" }}</label>
- </h3>
+ <div class="subsection-header">
+ <h3 class="user_group_setting_subsection_title">
+ <label for="people_to_add_in_group">{{t "Choose members" }}</label>
+ </h3>
+ </div>
<div id="user_group_membership_error" class="user_group_creation_error"></div>
<div class="controls" id="people_to_add_in_group"></div>
</section>
diff --git a/web/templates/user_group_settings/user_group_members.hbs b/web/templates/user_group_settings/user_group_members.hbs
index e47a4c5df58..22879c36545 100644
--- a/web/templates/user_group_settings/user_group_members.hbs
+++ b/web/templates/user_group_settings/user_group_members.hbs
@@ -3,9 +3,11 @@
{{> user_group_membership_status .}}
</div>
{{#unless group.is_system_group}}
- <h3 class="user_group_setting_subsection_title">
- {{t "Add members" }}
- </h3>
+ <div class="subsection-header">
+ <h3 class="user_group_setting_subsection_title">
+ {{t "Add members" }}
+ </h3>
+ </div>
<div class="user_group_subscription_request_result banner-wrapper"></div>
{{> add_members_form .}}
<div class="add-members-subtitle">