Zulip server and web application. Open-source team chat that helps teams stay productive and focused.
settings: Style headings via classes instead of bare h3 selectors.
Sahil Batra5284c3cf40c8
diff --git a/web/styles/settings.css b/web/styles/settings.cssindex 8cf44b1a0a1..8f4d017d564 100644--- a/web/styles/settings.css+++ b/web/styles/settings.css@@ -3,7 +3,8 @@ label {}label,-h3,+.settings-subsection-title,+.settings-table-title,/* We need settings-section-title here because some legacy settingswidgets use a <div> with this class for their heading. */.settings-section-title {@@ -13,6 +14,27 @@ h3,}}+/* Shared font for the subsection and table/list-panel headings across the+ settings, channel, and group settings overlays. */+.settings-subsection-title,+.settings-table-title {+ font-size: 1.5em;+ font-weight: normal;+ line-height: 1.5;+}++/* Subsection headings, used by both the settings panels and the channel+ and group overlays. */+.settings-subsection-title {+ margin: calc(0.3125 * var(--base-font-size-px)) 0; /* 5px 0 at 16px font size. */+}++/* Table/list-panel headings ('.settings_panel_list_header') use the larger+ table heading margin rather than the subsection margin. */+.settings-table-title {+ margin: 10px 0;+}+/* TODO: This should ideally be added to help_link_widget.hbs,allowing us to deduplicate at least the opacity CSS with thefa-question-circle-o logic above. */@@ -42,7 +64,8 @@ a.help_link_widget {}}-h3,+.settings-subsection-title,+.settings-table-title,.settings-section-title {.help_link_widget {margin-left: 5px;@@ -280,18 +303,6 @@ h3,}}- /* Bare <h3> section titles in settings panels (e.g. table-panel- headers in '.settings_panel_list_header') get their font-size,- font-weight, and line-height from the '#settings_page h3' rule- further down in this file; previously their margin came from the- universal h1-h4 reset in bootstrap.app.css. Set the margin- explicitly here so the spacing survives that reset's removal.- Headings inside a '.subsection-header' are overridden by the- higher-specificity '#settings_page .subsection-header h3' rule. */- & h3 {- margin: 10px 0;- }-.table-sticky-headers {position: sticky;top: 0;@@ -662,7 +673,7 @@ input[type="checkbox"] {align-items: center;gap: 0 0.625em;- .stream_setting_subsection_title {+ .settings-subsection-title {margin: 4px 0;}@@ -1438,19 +1449,6 @@ label.preferences-radio-choice-label {vertical-align: middle;}- & h3 {- font-size: 1.5em;- font-weight: normal;- line-height: 1.5;- }-- /* All non-table section headings sit in a '.subsection-header' and- share this margin; table-panel headings ('.settings_panel_list_header- h3') keep their own spacing. */- .subsection-header h3 {- margin: calc(0.3125 * var(--base-font-size-px)) 0; /* 5px 0 at 16px font size. */- }-& h5 {font-size: 1em;font-weight: normal;diff --git a/web/styles/subscriptions.css b/web/styles/subscriptions.cssindex cd32cfabbaf..117219dcfb6 100644--- a/web/styles/subscriptions.css+++ b/web/styles/subscriptions.css@@ -131,25 +131,6 @@margin-bottom: 20px;}-/* TODO: Unify with settings.css definition */-h3.stream_setting_subsection_title,-h3.user_group_setting_subsection_title {- font-size: 1.5em;- font-weight: normal;- line-height: 1.5;- /* Match the org settings subsection h3 margin. */- margin: calc(0.3125 * var(--base-font-size-px)) 0; /* 5px 0 at 16px font size. */-}--/* Member/subscriber list headers are table headings, not subsections, so- they keep the larger org settings table heading margin rather than the- subsection margin above. */-.subscribers-heading h3,-.members-list-header h3,-.create_user_group_member_list_header h3 {- margin: 10px 0;-}-.subscriber_list_settings_container.no-display {display: none;}@@ -429,13 +410,11 @@ h3.user_group_setting_subsection_title {margin: 10px 0;}- .subsection-header {- h3 {- font-size: 1.5em;- font-weight: normal;- line-height: 1.5;- margin: 10px 0;- }+ /* Per-permission subsection headings; a larger margin than other+ subsection headings, with font from the shared+ '.settings-subsection-title' rule. */+ .subsection-header .settings-subsection-title {+ margin: 10px 0;}.subsection-settings {diff --git a/web/templates/settings/account_settings.hbs b/web/templates/settings/account_settings.hbsindex 5f17341228e..1331d9736a9 100644--- a/web/templates/settings/account_settings.hbs+++ b/web/templates/settings/account_settings.hbs@@ -3,7 +3,7 @@<div class="account-settings-form"><div id="user_details_section"><div class="subsection-header">- <h3>{{t "Account" }}</h3>+ <h3 class="settings-subsection-title">{{t "Account" }}</h3><div class="alert-notification account-alert-notification" id="account-settings-status"></div></div><form class="grid">@@ -111,7 +111,7 @@<div id="api_key_button_box"><div class="subsection-header">- <h3>{{t "API key" }}</h3>+ <h3 class="settings-subsection-title">{{t "API key" }}</h3></div><div class="input-group">diff --git a/web/templates/settings/active_user_list_admin.hbs b/web/templates/settings/active_user_list_admin.hbsindex b979b7443b4..bb02ba9217d 100644--- a/web/templates/settings/active_user_list_admin.hbs+++ b/web/templates/settings/active_user_list_admin.hbs@@ -1,7 +1,7 @@<div id="admin-active-users-list" class="user-settings-section user-or-bot-settings-section" data-user-settings-section="active"><div class="settings_panel_list_header">- <h3>{{t "Users"}}</h3>+ <h3 class="settings-table-title">{{t "Users"}}</h3><div class="alert-notification" id="user-field-status"></div><div class="user_filters">{{> ../dropdown_widget widget_name=active_user_list_dropdown_widget_name}}diff --git a/web/templates/settings/admin_channel_folders.hbs b/web/templates/settings/admin_channel_folders.hbsindex 20f7e67bd2c..4e67a5b9e1e 100644--- a/web/templates/settings/admin_channel_folders.hbs+++ b/web/templates/settings/admin_channel_folders.hbs@@ -1,6 +1,6 @@<div id="channel-folder-settings" class="settings-section" data-name="channel-folders"><div class="settings_panel_list_header">- <h3>{{t "Channel folders"}}</h3>+ <h3 class="settings-table-title">{{t "Channel folders"}}</h3><div class="alert-notification" id="admin-channel-folder-status"></div>{{#if is_admin}}{{> ../components/action_buttondiff --git a/web/templates/settings/alert_word_settings.hbs b/web/templates/settings/alert_word_settings.hbsindex 6871c0a2ea6..7e1ecc910f2 100644--- a/web/templates/settings/alert_word_settings.hbs+++ b/web/templates/settings/alert_word_settings.hbs@@ -12,7 +12,7 @@}}<div class="settings_panel_list_header">- <h3>{{t "Alert words"}}</h3>+ <h3 class="settings-table-title">{{t "Alert words"}}</h3></div><div class="banner-wrapper" id="alert_word_status"></div><div class="progressive-table-wrapper" data-simplebar data-simplebar-tab-index="-1">diff --git a/web/templates/settings/attachments_settings.hbs b/web/templates/settings/attachments_settings.hbsindex 83634aa45c6..4501b22b42a 100644--- a/web/templates/settings/attachments_settings.hbs+++ b/web/templates/settings/attachments_settings.hbs@@ -1,7 +1,7 @@<div id="attachments-settings" class="settings-section" data-name="uploaded-files"><div id="attachment-stats-holder" class="banner-wrapper"></div><div class="settings_panel_list_header">- <h3>{{t "Your uploads"}}</h3>+ <h3 class="settings-table-title">{{t "Your uploads"}}</h3>{{> filter_text_input id="upload_file_search" placeholder=(t 'Filter') aria_label=(t 'Filter uploads')}}</div><div class="clear-float"></div>diff --git a/web/templates/settings/auth_methods_settings_admin.hbs b/web/templates/settings/auth_methods_settings_admin.hbsindex b287514692a..e2daae65be6 100644--- a/web/templates/settings/auth_methods_settings_admin.hbs+++ b/web/templates/settings/auth_methods_settings_admin.hbs@@ -11,7 +11,7 @@<form class="admin-realm-form org-authentications-form"><div id="org-auth_settings" class="settings-subsection-parent"><div class ="subsection-header">- <h3>{{t "Authentication methods" }}</h3>+ <h3 class="settings-subsection-title">{{t "Authentication methods" }}</h3>{{> settings_save_discard_widget section_name="auth_settings" show_save_discard_buttons=true }}</div>diff --git a/web/templates/settings/bot_list.hbs b/web/templates/settings/bot_list.hbsindex fd244636b4e..644c5b8476a 100644--- a/web/templates/settings/bot_list.hbs+++ b/web/templates/settings/bot_list.hbs@@ -1,5 +1,5 @@<div class="settings_panel_list_header">- <h3>{{section_title}}</h3>+ <h3 class="settings-table-title">{{section_title}}</h3><div class="alert-notification"></div><div class="bot-filters">{{> ../dropdown_widget widget_name=dropdown_widget_name}}diff --git a/web/templates/settings/data_exports_admin.hbs b/web/templates/settings/data_exports_admin.hbsindex 18c214c6963..f27f3bbcc73 100644--- a/web/templates/settings/data_exports_admin.hbs+++ b/web/templates/settings/data_exports_admin.hbs@@ -1,6 +1,6 @@<div id="data-exports" class="settings-section" data-name="data-exports-admin"><div class="subsection-header">- <h3>{{t "Export organization" }}+ <h3 class="settings-subsection-title">{{t "Export organization" }}{{> ../help_link_widget link="/help/export-your-organization" }}</h3></div>@@ -37,7 +37,7 @@<div class="export_section" data-export-section="data-exports"><div class="settings_panel_list_header">- <h3>{{t "Data exports"}}</h3>+ <h3 class="settings-table-title">{{t "Data exports"}}</h3><input type="hidden" class="search" placeholder="{{t 'Filter exports' }}"aria-label="{{t 'Filter exports' }}"/></div>@@ -64,7 +64,7 @@<div class="export_section" data-export-section="export-permissions"><div class="settings_panel_list_header">- <h3>{{t "Export permissions"}}</h3>+ <h3 class="settings-table-title">{{t "Export permissions"}}</h3><div class="user_filters">{{> ../dropdown_widget widget_name="filter_by_consent"}}{{> filter_text_input placeholder=(t 'Filter') aria_label=(t 'Filter users')}}diff --git a/web/templates/settings/deactivated_users_admin.hbs b/web/templates/settings/deactivated_users_admin.hbsindex 6f8996f172d..897118d5b59 100644--- a/web/templates/settings/deactivated_users_admin.hbs+++ b/web/templates/settings/deactivated_users_admin.hbs@@ -2,7 +2,7 @@<div class="clear-float"></div><div class="settings_panel_list_header">- <h3>{{t "Deactivated users" }}+ <h3 class="settings-table-title">{{t "Deactivated users" }}{{> ../help_link_widget link="/help/deactivate-or-reactivate-a-user" }}</h3><div class="alert-notification" id="deactivated-user-field-status"></div>diff --git a/web/templates/settings/default_streams_list_admin.hbs b/web/templates/settings/default_streams_list_admin.hbsindex 5e7f3a10a5a..6fc6c7e8d60 100644--- a/web/templates/settings/default_streams_list_admin.hbs+++ b/web/templates/settings/default_streams_list_admin.hbs@@ -2,7 +2,7 @@<p>{{t "Configure the default channels new users are subscribed to when joining your organization." }}</p><div class="settings_panel_list_header">- <h3>{{t "Default channels"}}</h3>+ <h3 class="settings-table-title">{{t "Default channels"}}</h3><div class="add_default_streams_button_container">{{> ../components/action_buttonid="show-add-default-streams-modal"diff --git a/web/templates/settings/emoji_settings_admin.hbs b/web/templates/settings/emoji_settings_admin.hbsindex 2e51a278513..0cd02df57f8 100644--- a/web/templates/settings/emoji_settings_admin.hbs+++ b/web/templates/settings/emoji_settings_admin.hbs@@ -14,7 +14,7 @@}}<div class="settings_panel_list_header">- <h3>{{t "Custom emoji"}}</h3>+ <h3 class="settings-table-title">{{t "Custom emoji"}}</h3>{{> filter_text_input placeholder=(t 'Filter') aria_label=(t 'Filter emoji')}}</div><div class="progressive-table-wrapper" data-simplebar data-simplebar-tab-index="-1">diff --git a/web/templates/settings/imported_user_list_admin.hbs b/web/templates/settings/imported_user_list_admin.hbsindex 1fc8e97726e..3ad96644601 100644--- a/web/templates/settings/imported_user_list_admin.hbs+++ b/web/templates/settings/imported_user_list_admin.hbs@@ -1,7 +1,7 @@<div id="admin-imported-users-list" class="user-settings-section user-or-bot-settings-section" data-user-settings-section="imported"><div class="settings_panel_list_header">- <h3>{{t "Imported users"}}</h3>+ <h3 class="settings-table-title">{{t "Imported users"}}</h3><div class="alert-notification" id="user-field-status"></div><div class="user_filters">{{> ../dropdown_widget widget_name=imported_user_list_dropdown_widget_name}}diff --git a/web/templates/settings/invites_list_admin.hbs b/web/templates/settings/invites_list_admin.hbsindex 5ca016da548..0f70b5e115c 100644--- a/web/templates/settings/invites_list_admin.hbs+++ b/web/templates/settings/invites_list_admin.hbs@@ -22,7 +22,7 @@custom_classes="user-settings-invite-user-label invite-user-link"}}<div class="settings_panel_list_header">- <h3>{{t "Invitations "}}</h3>+ <h3 class="settings-table-title">{{t "Invitations "}}</h3><div class="alert-notification" id="invites-field-status"></div>{{> filter_text_input placeholder=(t 'Filter') aria_label=(t 'Filter invitations')}}</div>diff --git a/web/templates/settings/linkifier_settings_admin.hbs b/web/templates/settings/linkifier_settings_admin.hbsindex e5456b5e8fc..788d4f130f2 100644--- a/web/templates/settings/linkifier_settings_admin.hbs+++ b/web/templates/settings/linkifier_settings_admin.hbs@@ -27,7 +27,7 @@{{/if}}<div class="settings_panel_list_header">- <h3>{{t "Linkifiers"}}</h3>+ <h3 class="settings-table-title">{{t "Linkifiers"}}</h3><div class="alert-notification edit-linkifier-status" id="linkifier-field-status"></div>{{> filter_text_input placeholder=(t 'Filter') aria_label=(t 'Filter linkifiers')}}</div>diff --git a/web/templates/settings/muted_users_settings.hbs b/web/templates/settings/muted_users_settings.hbsindex 2b93df66d59..33c774f3532 100644--- a/web/templates/settings/muted_users_settings.hbs+++ b/web/templates/settings/muted_users_settings.hbs@@ -1,6 +1,6 @@<div id="muted-user-settings" class="settings-section" data-name="muted-users"><div class="settings_panel_list_header">- <h3>{{t "Muted users"}}</h3>+ <h3 class="settings-table-title">{{t "Muted users"}}</h3>{{> filter_text_input id="muted_users_search" placeholder=(t 'Filter') aria_label=(t 'Filter muted users')}}</div><div class="progressive-table-wrapper" data-simplebar data-simplebar-tab-index="-1">diff --git a/web/templates/settings/notification_settings.hbs b/web/templates/settings/notification_settings.hbsindex 6866e7598dd..e6bdbfc5d7a 100644--- a/web/templates/settings/notification_settings.hbs+++ b/web/templates/settings/notification_settings.hbs@@ -1,7 +1,7 @@<form class="notification-settings-form"><div class="general_notifications {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}"><div class="subsection-header">- <h3>{{t "Notification triggers" }}</h3>+ <h3 class="settings-subsection-title">{{t "Notification triggers" }}</h3>{{#if for_realm_settings}}{{> ../components/icon_button icon="reset" intent="neutral" custom_classes="reset-user-setting-to-default" data-tippy-content=(t "Reset users to default") aria-label=(t "Reset users to default") }}{{/if}}@@ -76,7 +76,7 @@<div class="topic_notifications m-10 {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}"><div class="subsection-header">- <h3>{{t "Topic notifications" }}+ <h3 class="settings-subsection-title">{{t "Topic notifications" }}{{> ../help_link_widget link="/help/topic-notifications" }}</h3>{{> settings_save_discard_widget section_name="topic-notifications-settings" show_save_discard_buttons=for_realm_settings }}@@ -140,7 +140,7 @@<div class="desktop_notifications m-10 {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}"><div class="subsection-header">- <h3>{{t "Desktop message notifications" }}+ <h3 class="settings-subsection-title">{{t "Desktop message notifications" }}{{> ../help_link_widget link="/help/desktop-notifications" }}</h3>{{> settings_save_discard_widget section_name="desktop-message-settings" show_save_discard_buttons=for_realm_settings }}@@ -207,7 +207,7 @@<div class="mobile_notifications m-10 {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}"><div class="subsection-header">- <h3>{{t "Mobile message notifications" }}+ <h3 class="settings-subsection-title">{{t "Mobile message notifications" }}{{> ../help_link_widget link="/help/mobile-notifications" }}</h3>{{> settings_save_discard_widget section_name="mobile-message-settings" show_save_discard_buttons=for_realm_settings }}@@ -231,7 +231,7 @@<div class="email_message_notifications m-10 {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}"><div class="subsection-header">- <h3>{{t "Email message notifications" }}+ <h3 class="settings-subsection-title">{{t "Email message notifications" }}{{> ../help_link_widget link="/help/email-notifications" }}</h3>{{> settings_save_discard_widget section_name="email-message-settings" show_save_discard_buttons=for_realm_settings }}@@ -289,7 +289,7 @@<div class="other_email_notifications m-10 {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}"><div class="subsection-header">- <h3>{{t "Other emails" }}</h3>+ <h3 class="settings-subsection-title">{{t "Other emails" }}</h3>{{> settings_save_discard_widget section_name="other-emails-settings" show_save_discard_buttons=for_realm_settings }}</div>{{#each notification_settings.other_email_settings}}diff --git a/web/templates/settings/organization_permissions_admin.hbs b/web/templates/settings/organization_permissions_admin.hbsindex 97e22484f33..49e07ea0395 100644--- a/web/templates/settings/organization_permissions_admin.hbs+++ b/web/templates/settings/organization_permissions_admin.hbs@@ -3,7 +3,7 @@<div id="org-join-settings" class="settings-subsection-parent"><div class="subsection-header">- <h3>+ <h3 class="settings-subsection-title">{{t "Joining the organization" }}<i class="fa fa-info-circle settings-info-icon tippy-zulip-tooltip" aria-hidden="true" data-tippy-content="{{t 'Only owners can change these settings.' }}"></i></h3>@@ -60,7 +60,7 @@<div id="org-stream-permissions" class="settings-subsection-parent"><div class="subsection-header">- <h3>{{t "Channel permissions" }}+ <h3 class="settings-subsection-title">{{t "Channel permissions" }}{{> ../help_link_widget link="/help/channel-permissions" }}</h3>{{> settings_save_discard_widget section_name="stream-permissions" show_save_discard_buttons=true }}@@ -105,7 +105,7 @@<div id="org-group-permissions" class="settings-subsection-parent"><div class="subsection-header">- <h3>{{t "Group permissions" }}+ <h3 class="settings-subsection-title">{{t "Group permissions" }}{{> ../help_link_widget link="/help/manage-user-groups" }}</h3>{{> settings_save_discard_widget section_name="group-permissions" show_save_discard_buttons=true }}@@ -121,7 +121,7 @@<div id="org-direct-message-permissions" class="settings-subsection-parent"><div class="subsection-header">- <h3>{{t "Direct message permissions" }}+ <h3 class="settings-subsection-title">{{t "Direct message permissions" }}{{> ../help_link_widget link="/help/restrict-direct-messages" }}</h3>{{> settings_save_discard_widget section_name="direct-message-permissions" show_save_discard_buttons=true }}@@ -138,7 +138,7 @@<div id="org-msg-editing" class="settings-subsection-parent"><div class="subsection-header">- <h3>{{t "Message editing" }}+ <h3 class="settings-subsection-title">{{t "Message editing" }}{{> ../help_link_widget link="/help/restrict-message-editing-and-deletion" }}</h3>{{> settings_save_discard_widget section_name="msg-editing" show_save_discard_buttons=true }}@@ -184,7 +184,7 @@<div id="org-moving-msgs" class="settings-subsection-parent"><div class="subsection-header">- <h3>{{t "Moving messages" }}+ <h3 class="settings-subsection-title">{{t "Moving messages" }}{{> ../help_link_widget link="/help/restrict-moving-messages" }}</h3>{{> settings_save_discard_widget section_name="moving-msgs" show_save_discard_buttons=true }}@@ -247,7 +247,7 @@<div id="org-msg-deletion" class="settings-subsection-parent"><div class="subsection-header">- <h3>{{t "Message deletion" }}+ <h3 class="settings-subsection-title">{{t "Message deletion" }}{{> ../help_link_widget link="/help/delete-a-message" }}</h3>{{> settings_save_discard_widget section_name="msg-deletion" show_save_discard_buttons=true }}@@ -289,7 +289,7 @@<div id="org-user-identity" class="settings-subsection-parent"><div class="subsection-header">- <h3>{{t "User identity" }}+ <h3 class="settings-subsection-title">{{t "User identity" }}{{> ../help_link_widget link="/help/restrict-name-and-email-changes" }}</h3>{{> settings_save_discard_widget section_name="user-identity" show_save_discard_buttons=true }}@@ -324,7 +324,7 @@<div id="org-guest-settings" class="settings-subsection-parent"><div class="subsection-header">- <h3>{{t "Guests" }}</h3>+ <h3 class="settings-subsection-title">{{t "Guests" }}</h3>{{> settings_save_discard_widget section_name="guest-settings" show_save_discard_buttons=true }}</div>@@ -349,7 +349,7 @@<div id="org-other-permissions" class="settings-subsection-parent"><div class="subsection-header">- <h3>{{t "Other permissions" }}</h3>+ <h3 class="settings-subsection-title">{{t "Other permissions" }}</h3>{{> settings_save_discard_widget section_name="other-permissions" show_save_discard_buttons=true }}</div><div class="disabled-unfinished-feature"diff --git a/web/templates/settings/organization_profile_admin.hbs b/web/templates/settings/organization_profile_admin.hbsindex c09ce9dd38c..e268f25ba6f 100644--- a/web/templates/settings/organization_profile_admin.hbs+++ b/web/templates/settings/organization_profile_admin.hbs@@ -4,7 +4,7 @@<div id="org-org-profile" class="settings-subsection-parent"><div class="subsection-header">- <h3>{{t "Organization profile" }}+ <h3 class="settings-subsection-title">{{t "Organization profile" }}{{> ../help_link_widget link="/help/create-your-organization-profile" }}</h3>{{> settings_save_discard_widget section_name="org-profile" show_save_discard_buttons=true }}@@ -52,7 +52,7 @@intent="brand"}}<div class="subsection-header">- <h3>{{t "Organization logo" }}+ <h3 class="settings-subsection-title">{{t "Organization logo" }}{{> ../help_link_widget link="/help/create-your-organization-profile#add-a-wide-logo" }}</h3></div>@@ -81,7 +81,7 @@</div><div class="deactivate-realm-section"><div class="subsection-header">- <h3>+ <h3 class="settings-subsection-title">{{t "Deactivate organization" }}{{> ../help_link_widget link="/help/deactivate-your-organization" }}</h3>diff --git a/web/templates/settings/organization_settings_admin.hbs b/web/templates/settings/organization_settings_admin.hbsindex 5754ea74fa6..e44c62e7339 100644--- a/web/templates/settings/organization_settings_admin.hbs+++ b/web/templates/settings/organization_settings_admin.hbs@@ -3,7 +3,7 @@<div id="org-billing" class="settings-subsection-parent"><div class="subsection-header">- <h3>{{t "Billing" }}</h3>+ <h3 class="settings-subsection-title">{{t "Billing" }}</h3>{{> settings_save_discard_widget section_name="onboarding" show_save_discard_buttons=true }}</div>{{#if show_two_tier_billing_settings}}@@ -35,7 +35,7 @@</div><div id="org-notifications" class="settings-subsection-parent"><div class="subsection-header">- <h3>{{t "Automated messages and emails" }}</h3>+ <h3 class="settings-subsection-title">{{t "Automated messages and emails" }}</h3>{{> settings_save_discard_widget section_name="notifications" show_save_discard_buttons=true }}</div>{{> ../dropdown_widget_with_label@@ -103,7 +103,7 @@<div id="org-onboarding" class="settings-subsection-parent"><div class="subsection-header">- <h3>{{t "Onboarding" }}</h3>+ <h3 class="settings-subsection-title">{{t "Onboarding" }}</h3>{{> settings_save_discard_widget section_name="onboarding" show_save_discard_buttons=true }}</div><div class="input-group">@@ -163,7 +163,7 @@<div class="settings-subsection-parent"><div class="subsection-header">- <h3>{{t "Notifications security" }}</h3>+ <h3 class="settings-subsection-title">{{t "Notifications security" }}</h3>{{> settings_save_discard_widget section_name="notifications-security" show_save_discard_buttons=true }}</div>{{> settings_checkbox@@ -182,7 +182,7 @@<div id="org-compose-settings" class="settings-subsection-parent"><div class="subsection-header">- <h3>{{t "Compose settings"}}</h3>+ <h3 class="settings-subsection-title">{{t "Compose settings"}}</h3>{{> settings_save_discard_widget section_name="compose-settings" show_save_discard_buttons=true }}</div><div class="input-group">@@ -245,7 +245,7 @@<div id="org-msg-feed-settings" class="settings-subsection-parent"><div class="subsection-header">- <h3>{{t "Message feed settings"}}</h3>+ <h3 class="settings-subsection-title">{{t "Message feed settings"}}</h3>{{> settings_save_discard_widget section_name="msg-feed-settings" show_save_discard_buttons=true }}</div>{{> ../dropdown_widget_with_label@@ -288,7 +288,7 @@<div id="org-message-retention" class="settings-subsection-parent"><div class="subsection-header">- <h3>{{t "Message retention period" }}+ <h3 class="settings-subsection-title">{{t "Message retention period" }}{{> ../help_link_widget link="/help/message-retention-policy" }}</h3>{{> settings_save_discard_widget section_name="message-retention" show_save_discard_buttons=true }}diff --git a/web/templates/settings/playground_settings_admin.hbs b/web/templates/settings/playground_settings_admin.hbsindex f47ea626366..2124e428c8f 100644--- a/web/templates/settings/playground_settings_admin.hbs+++ b/web/templates/settings/playground_settings_admin.hbs@@ -67,7 +67,7 @@{{/if}}<div class="settings_panel_list_header">- <h3>{{t "Code playgrounds"}}</h3>+ <h3 class="settings-table-title">{{t "Code playgrounds"}}</h3>{{> filter_text_input placeholder=(t 'Filter') aria_label=(t 'Filter code playgrounds')}}</div>diff --git a/web/templates/settings/preferences_emoji.hbs b/web/templates/settings/preferences_emoji.hbsindex c2c6a6b2719..d3072257fc1 100644--- a/web/templates/settings/preferences_emoji.hbs+++ b/web/templates/settings/preferences_emoji.hbs@@ -1,6 +1,6 @@<div class="emoji-preferences {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}"><div class="subsection-header">- <h3>{{t "Emoji" }}</h3>+ <h3 class="settings-subsection-title">{{t "Emoji" }}</h3>{{> settings_save_discard_widget section_name="emoji-preferences-settings" show_save_discard_buttons=for_realm_settings }}</div>diff --git a/web/templates/settings/preferences_general.hbs b/web/templates/settings/preferences_general.hbsindex 632a373ff61..58d7d79c664 100644--- a/web/templates/settings/preferences_general.hbs+++ b/web/templates/settings/preferences_general.hbs@@ -2,7 +2,7 @@<!-- this is inline block so that the alert notification can sit besideit. If there's not an alert, don't make it inline-block.--><div class="subsection-header">- <h3>{{t "General" }}</h3>+ <h3 class="settings-subsection-title">{{t "General" }}</h3>{{> settings_save_discard_widget section_name="general-settings" show_save_discard_buttons=for_realm_settings }}</div>{{#unless for_realm_settings}}diff --git a/web/templates/settings/preferences_information.hbs b/web/templates/settings/preferences_information.hbsindex 3f2d60d6a85..b133a5433cc 100644--- a/web/templates/settings/preferences_information.hbs+++ b/web/templates/settings/preferences_information.hbs@@ -1,6 +1,6 @@<div class="information-settings {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}"><div class="subsection-header">- <h3>{{t "Information" }}</h3>+ <h3 class="settings-subsection-title">{{t "Information" }}</h3>{{> settings_save_discard_widget section_name="information-settings" show_save_discard_buttons=for_realm_settings }}</div>diff --git a/web/templates/settings/preferences_left_sidebar.hbs b/web/templates/settings/preferences_left_sidebar.hbsindex fd35c647509..978460da6e2 100644--- a/web/templates/settings/preferences_left_sidebar.hbs+++ b/web/templates/settings/preferences_left_sidebar.hbs@@ -1,6 +1,6 @@<div class="left-sidebar-settings {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}"><div class="subsection-header">- <h3>{{t "Left sidebar" }}</h3>+ <h3 class="settings-subsection-title">{{t "Left sidebar" }}</h3>{{> settings_save_discard_widget section_name="left-sidebar-settings" show_save_discard_buttons=for_realm_settings }}</div>diff --git a/web/templates/settings/preferences_navigation.hbs b/web/templates/settings/preferences_navigation.hbsindex 4e5fa8013d6..31108e582a3 100644--- a/web/templates/settings/preferences_navigation.hbs+++ b/web/templates/settings/preferences_navigation.hbs@@ -1,6 +1,6 @@<div class="navigation-settings {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}"><div class="subsection-header">- <h3>{{t "Navigation" }}</h3>+ <h3 class="settings-subsection-title">{{t "Navigation" }}</h3>{{> settings_save_discard_widget section_name="navigation-settings" show_save_discard_buttons=for_realm_settings }}</div>diff --git a/web/templates/settings/privacy_settings.hbs b/web/templates/settings/privacy_settings.hbsindex ee2482d83dd..aa1e8e0f436 100644--- a/web/templates/settings/privacy_settings.hbs+++ b/web/templates/settings/privacy_settings.hbs@@ -2,10 +2,10 @@{{/if}}><div class="subsection-header">{{#if for_realm_settings}}- <h3>{{t "Privacy settings"}}</h3>+ <h3 class="settings-subsection-title">{{t "Privacy settings"}}</h3>{{> settings_save_discard_widget section_name="privacy-setting" show_save_discard_buttons=true }}{{else}}- <h3>{{t "Privacy"}}</h3>+ <h3 class="settings-subsection-title">{{t "Privacy"}}</h3>{{> settings_save_discard_widget section_name="privacy-setting" }}{{/if}}</div>diff --git a/web/templates/settings/profile_field_settings_admin.hbs b/web/templates/settings/profile_field_settings_admin.hbsindex 06ffa4bb14d..2738b883df0 100644--- a/web/templates/settings/profile_field_settings_admin.hbs+++ b/web/templates/settings/profile_field_settings_admin.hbs@@ -1,6 +1,6 @@<div id="profile-field-settings" class="settings-section" data-name="profile-field-settings"><div class="settings_panel_list_header">- <h3>{{t "Custom profile fields"}}</h3>+ <h3 class="settings-table-title">{{t "Custom profile fields"}}</h3><div class="alert-notification" id="admin-profile-field-status"></div>{{#if is_admin}}{{> ../components/action_buttondiff --git a/web/templates/settings/profile_settings.hbs b/web/templates/settings/profile_settings.hbsindex 8af270c06c3..bf97d08cc40 100644--- a/web/templates/settings/profile_settings.hbs+++ b/web/templates/settings/profile_settings.hbs@@ -2,7 +2,7 @@<div class="profile-settings-form"><div class="profile-main-panel inline-block"><div class="subsection-header">- <h3 id="user-profile-header">{{t "Profile" }}</h3>+ <h3 id="user-profile-header" class="settings-subsection-title">{{t "Profile" }}</h3></div><div id="user_details_section"><div class="full-name-change-container">diff --git a/web/templates/settings/user_topics_settings.hbs b/web/templates/settings/user_topics_settings.hbsindex 6613eaa1b29..7b9f7d4df8b 100644--- a/web/templates/settings/user_topics_settings.hbs+++ b/web/templates/settings/user_topics_settings.hbs@@ -8,7 +8,7 @@{{/tr}}</p><div class="settings_panel_list_header">- <h3>{{t "Topic settings"}}+ <h3 class="settings-table-title">{{t "Topic settings"}}{{> ../help_link_widget link="/help/topic-notifications" }}</h3>{{> settings_save_discard_widget section_name="user-topics-settings" }}diff --git a/web/templates/stream_settings/channel_permissions.hbs b/web/templates/stream_settings/channel_permissions.hbsindex 0f5f1422ef5..ff235d71313 100644--- a/web/templates/stream_settings/channel_permissions.hbs+++ b/web/templates/stream_settings/channel_permissions.hbs@@ -1,6 +1,6 @@<div id="channel-subscription-permissions" class="settings-subsection-parent"><div class="subsection-header">- <h3 class="stream_setting_subsection_title">{{t "Subscription management"}}</h3>+ <h3 class="settings-subsection-title">{{t "Subscription management"}}</h3>{{#if is_stream_edit}}{{> ../settings/settings_save_discard_widget section_name="subscription-permissions" show_save_discard_buttons=true}}{{/if}}@@ -55,7 +55,7 @@<div id="channel-messaging-permissions" class="settings-subsection-parent"><div class="subsection-header">- <h3 class="stream_setting_subsection_title">{{t "Messaging permissions"}}</h3>+ <h3 class="settings-subsection-title">{{t "Messaging permissions"}}</h3>{{#if is_stream_edit}}{{> ../settings/settings_save_discard_widget section_name="messaging-permissions" show_save_discard_buttons=true}}{{/if}}@@ -84,7 +84,7 @@<div id="channel-moderation-permissions" class="settings-subsection-parent"><div class="subsection-header">- <h3 class="stream_setting_subsection_title">{{t "Moderation permissions"}}</h3>+ <h3 class="settings-subsection-title">{{t "Moderation permissions"}}</h3>{{#if is_stream_edit}}{{> ../settings/settings_save_discard_widget section_name="moderation-permissions" show_save_discard_buttons=true}}{{/if}}@@ -118,7 +118,7 @@<div id="channel-administrative-permissions" class="settings-subsection-parent"><div class="subsection-header">- <h3 class="stream_setting_subsection_title">{{t "Administrative permissions"}}</h3>+ <h3 class="settings-subsection-title">{{t "Administrative permissions"}}</h3>{{#if is_stream_edit}}{{> ../settings/settings_save_discard_widget section_name="administrative-permissions" show_save_discard_buttons=true}}{{/if}}diff --git a/web/templates/stream_settings/new_stream_configuration.hbs b/web/templates/stream_settings/new_stream_configuration.hbsindex 9422032b20d..673526e7bdc 100644--- a/web/templates/stream_settings/new_stream_configuration.hbs+++ b/web/templates/stream_settings/new_stream_configuration.hbs@@ -25,7 +25,7 @@<div class="advance-config-title-container"><div class="advance-config-toggle-area"><i class="fa fa-sm fa-caret-right toggle-advanced-configurations-icon" aria-hidden="true"></i>- <h3 class="stream_setting_subsection_title"><span>{{t 'Advanced configuration' }}</span></h3>+ <h3 class="settings-subsection-title"><span>{{t 'Advanced configuration' }}</span></h3></div></div><div class="advanced-configurations-collapase-view hide">diff --git a/web/templates/stream_settings/new_stream_users.hbs b/web/templates/stream_settings/new_stream_users.hbsindex 078df89721b..1bb186a9b72 100644--- a/web/templates/stream_settings/new_stream_users.hbs+++ b/web/templates/stream_settings/new_stream_users.hbs@@ -13,7 +13,7 @@<div class="settings_panel_list_header"><div class="subscribers-heading">- <h3 class="stream_setting_subsection_title">{{t 'Subscribers preview' }}</h3>+ <h3 class="settings-table-title">{{t 'Subscribers preview' }}</h3><div class="add-subscriber-loading-spinner"></div></div><div class="user_filters">diff --git a/web/templates/stream_settings/stream_creation_form.hbs b/web/templates/stream_settings/stream_creation_form.hbsindex 5938de31e2b..f5e5255ba39 100644--- a/web/templates/stream_settings/stream_creation_form.hbs+++ b/web/templates/stream_settings/stream_creation_form.hbs@@ -33,7 +33,7 @@<div class="subscribers_container stream_creation_container"><section class="stream_create_add_subscriber_container"><div class="subsection-header">- <h3 class="stream_setting_subsection_title">+ <h3 class="settings-subsection-title"><label class="choose-subscribers-label">{{t "Choose subscribers" }}</label></h3></div>diff --git a/web/templates/stream_settings/stream_members.hbs b/web/templates/stream_settings/stream_members.hbsindex f5ec6a8ff0f..c2defbf84a5 100644--- a/web/templates/stream_settings/stream_members.hbs+++ b/web/templates/stream_settings/stream_members.hbs@@ -1,6 +1,6 @@<div class="subscriber_list_settings_container no-display"><div class="subsection-header add-subscribers-heading">- <h3 class="stream_setting_subsection_title">+ <h3 class="settings-subsection-title">{{t "Add subscribers" }}</h3></div>@@ -25,7 +25,7 @@</div><div class="settings_panel_list_header"><div class="subscribers-heading">- <h3 class="stream_setting_subsection_title">{{t "Subscribers"}}</h3>+ <h3 class="settings-table-title">{{t "Subscribers"}}</h3><div class="add-subscriber-loading-spinner"></div></div><div class="user_filters">diff --git a/web/templates/stream_settings/stream_settings.hbs b/web/templates/stream_settings/stream_settings.hbsindex cb81a9591ad..436d63bd5f9 100644--- a/web/templates/stream_settings/stream_settings.hbs+++ b/web/templates/stream_settings/stream_settings.hbs@@ -42,7 +42,7 @@<div class="stream-settings-subsection settings-subsection-parent"><div class="subsection-header">- <h3 class="stream_setting_subsection_title">+ <h3 class="settings-subsection-title">{{t "Settings" }}</h3>{{> ../settings/settings_save_discard_widget section_name="channel-general-settings" show_save_discard_buttons=true}}@@ -83,7 +83,7 @@<div id="personal-stream-settings" class="stream_section" data-stream-section="personal"><div class="subsection-parent"><div class="subsection-header">- <h3 class="stream_setting_subsection_title">{{t "Personal settings" }}</h3>+ <h3 class="settings-subsection-title">{{t "Personal settings" }}</h3><div class="stream_change_property_status alert-notification"></div></div>{{#each other_settings}}@@ -109,7 +109,7 @@</div><div class="subsection-parent"><div class="subsection-header">- <h3 class="stream_setting_subsection_title">{{t "Notification settings" }}</h3>+ <h3 class="settings-subsection-title">{{t "Notification settings" }}</h3><div class="stream_change_property_status alert-notification"></div></div><div class="input-group">diff --git a/web/templates/user_group_settings/group_permission_settings.hbs b/web/templates/user_group_settings/group_permission_settings.hbsindex b739b417992..6e4a3593f9d 100644--- a/web/templates/user_group_settings/group_permission_settings.hbs+++ b/web/templates/user_group_settings/group_permission_settings.hbs@@ -5,7 +5,7 @@{{#each group_assigned_realm_permissions}}<div class="settings-subsection-parent {{subsection_key}} {{#if (eq assigned_permissions.length 0)}}hide{{/if}}"><div class="subsection-header">- <h3>{{subsection_heading}}</h3>+ <h3 class="settings-subsection-title">{{subsection_heading}}</h3>{{> ../settings/settings_save_discard_widget show_save_discard_buttons=true }}</div>diff --git a/web/templates/user_group_settings/new_user_group_users.hbs b/web/templates/user_group_settings/new_user_group_users.hbsindex ba3c72ec233..e892ec6cf7a 100644--- a/web/templates/user_group_settings/new_user_group_users.hbs+++ b/web/templates/user_group_settings/new_user_group_users.hbs@@ -13,7 +13,7 @@</div><div class="settings_panel_list_header create_user_group_member_list_header">- <h3 class="user_group_setting_subsection_title">{{t 'Members preview' }}</h3>+ <h3 class="settings-table-title">{{t 'Members preview' }}</h3><div class="user_filters">{{> ../settings/filter_text_input placeholder=(t 'Filter') aria_label=(t 'Filter members') }}</div>diff --git a/web/templates/user_group_settings/stream_group_permission_settings.hbs b/web/templates/user_group_settings/stream_group_permission_settings.hbsindex 89932c9435b..8fc81256fcc 100644--- a/web/templates/user_group_settings/stream_group_permission_settings.hbs+++ b/web/templates/user_group_settings/stream_group_permission_settings.hbs@@ -1,6 +1,6 @@<div class="settings-subsection-parent" data-stream-id="{{stream.stream_id}}"><div class="subsection-header">- <h3>+ <h3 class="settings-subsection-title">{{> ../decorated_channel_name stream=stream }}</h3>{{> ../settings/settings_save_discard_widget show_save_discard_buttons=true }}diff --git a/web/templates/user_group_settings/user_group_creation_form.hbs b/web/templates/user_group_settings/user_group_creation_form.hbsindex 9411ca82cf5..034d5a4753e 100644--- a/web/templates/user_group_settings/user_group_creation_form.hbs+++ b/web/templates/user_group_settings/user_group_creation_form.hbs@@ -25,7 +25,7 @@<section id="user-group-permission-container"><div class="group-permissions settings-subsection-parent" id="new_group_permission_settings"><div class="subsection-header">- <h3 class="user_group_setting_subsection_title">{{t "Group permissions" }}+ <h3 class="settings-subsection-title">{{t "Group permissions" }}</h3></div>@@ -36,7 +36,7 @@<div class="user_group_members_container user_group_creation"><section id="choose_member_section"><div class="subsection-header">- <h3 class="user_group_setting_subsection_title">+ <h3 class="settings-subsection-title"><label for="people_to_add_in_group">{{t "Choose members" }}</label></h3></div>diff --git a/web/templates/user_group_settings/user_group_members.hbs b/web/templates/user_group_settings/user_group_members.hbsindex b4d2f4a2e6a..55002188122 100644--- a/web/templates/user_group_settings/user_group_members.hbs+++ b/web/templates/user_group_settings/user_group_members.hbs@@ -4,7 +4,7 @@</div>{{#unless group.is_system_group}}<div class="subsection-header">- <h3 class="user_group_setting_subsection_title">+ <h3 class="settings-subsection-title">{{t "Add members" }}</h3></div>@@ -23,7 +23,7 @@</div>{{/unless}}<div class="settings_panel_list_header members-list-header">- <h3 class="user_group_setting_subsection_title">{{t "Members"}}</h3>+ <h3 class="settings-table-title">{{t "Members"}}</h3><div class="user_filters">{{> ../settings/filter_text_input placeholder=(t 'Filter') aria_label=(t 'Filter members') }}</div>diff --git a/web/templates/user_group_settings/user_group_permission_settings.hbs b/web/templates/user_group_settings/user_group_permission_settings.hbsindex 123409f69ba..caa29e50639 100644--- a/web/templates/user_group_settings/user_group_permission_settings.hbs+++ b/web/templates/user_group_settings/user_group_permission_settings.hbs@@ -1,6 +1,6 @@<div class="settings-subsection-parent" data-group-id="{{group_id}}"><div class="subsection-header">- <h3>{{group_name}}</h3>+ <h3 class="settings-subsection-title">{{group_name}}</h3>{{> ../settings/settings_save_discard_widget show_save_discard_buttons=true }}</div>diff --git a/web/templates/user_group_settings/user_group_settings.hbs b/web/templates/user_group_settings/user_group_settings.hbsindex e1d01f1ba03..c2d40df3921 100644--- a/web/templates/user_group_settings/user_group_settings.hbs+++ b/web/templates/user_group_settings/user_group_settings.hbs@@ -27,7 +27,7 @@{{#unless group.is_system_group}}<div class="group-permissions settings-subsection-parent" id="group_permission_settings"><div class="subsection-header">- <h3 class="user_group_setting_subsection_title">+ <h3 class="settings-subsection-title">{{t "Group permissions" }}{{> ../help_link_widget link="/help/manage-user-groups#configure-group-permissions"}}</h3>