mirror of
https://github.com/zulip/zulip.git
synced 2025-10-24 08:33:43 +00:00
settings: Improve subsection header styling.
This commit makes all the subsection header as flex boxes, and improves it's CSS styling.
This commit is contained in:
@@ -869,22 +869,18 @@ input.settings_text_input {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#stream_settings,
|
.subsection-header {
|
||||||
#settings_page,
|
display: flex;
|
||||||
#user_group_settings {
|
flex-wrap: wrap;
|
||||||
.subsection-header {
|
margin: 0.2857em 0;
|
||||||
display: flex;
|
gap: 0 0.625em; /* 10px at 16px em */
|
||||||
flex-wrap: wrap;
|
align-items: center;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#stream_settings .save-button-controls,
|
.save-button-controls {
|
||||||
#settings_page .save-button-controls,
|
|
||||||
#user_group_settings .save-button-controls {
|
|
||||||
display: flex;
|
display: flex;
|
||||||
margin: 0.2857em 0.5714em; /* 4px 8px at 14px/em */
|
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 5px;
|
gap: 0.3125em; /* 5px at 16px em */
|
||||||
|
|
||||||
&.hide {
|
&.hide {
|
||||||
display: none;
|
display: none;
|
||||||
|
|||||||
@@ -507,13 +507,10 @@ input[type="checkbox"] {
|
|||||||
|
|
||||||
.advanced-configurations-container {
|
.advanced-configurations-container {
|
||||||
.advance-config-title-container {
|
.advance-config-title-container {
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
flex-wrap: wrap;
|
|
||||||
|
|
||||||
.stream_setting_subsection_title {
|
.stream_setting_subsection_title {
|
||||||
margin: 4px 8px;
|
margin: 4px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.toggle-advanced-configurations-icon {
|
.toggle-advanced-configurations-icon {
|
||||||
|
|||||||
@@ -121,7 +121,7 @@ h3.user_group_setting_subsection_title {
|
|||||||
font-size: 1.5em;
|
font-size: 1.5em;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
line-height: 1.5;
|
line-height: 1.5;
|
||||||
margin: 4px 15px 4px 0;
|
margin: 4px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
h4.stream_setting_subsection_title {
|
h4.stream_setting_subsection_title {
|
||||||
@@ -134,8 +134,6 @@ h4.user_group_setting_subsection_title {
|
|||||||
font-size: 1.35em;
|
font-size: 1.35em;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
line-height: 1.5;
|
line-height: 1.5;
|
||||||
/* Matches right margin on h3 subsection titles */
|
|
||||||
margin-right: 15px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.member-list-box,
|
.member-list-box,
|
||||||
@@ -307,8 +305,6 @@ h4.user_group_setting_subsection_title {
|
|||||||
|
|
||||||
.group-assigned-permissions {
|
.group-assigned-permissions {
|
||||||
.subsection-header {
|
.subsection-header {
|
||||||
display: inline;
|
|
||||||
|
|
||||||
h3 {
|
h3 {
|
||||||
font-size: 1.5em;
|
font-size: 1.5em;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
@@ -1521,15 +1517,6 @@ div.settings-radio-input-parent {
|
|||||||
max-width: max-content;
|
max-width: max-content;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.save-button-controls {
|
|
||||||
display: block;
|
|
||||||
margin: 0 0 10px;
|
|
||||||
|
|
||||||
&.hide {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<form class="notification-settings-form">
|
<form class="notification-settings-form">
|
||||||
<div class="general_notifications {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">
|
<div class="general_notifications {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">
|
||||||
<div class="subsection-header inline-block">
|
<div class="subsection-header">
|
||||||
<h3>{{t "Notification triggers" }}</h3>
|
<h3>{{t "Notification triggers" }}</h3>
|
||||||
{{> settings_save_discard_widget section_name="general-notify-settings" show_only_indicator=(not for_realm_settings) }}
|
{{> settings_save_discard_widget section_name="general-notify-settings" show_only_indicator=(not for_realm_settings) }}
|
||||||
</div>
|
</div>
|
||||||
@@ -55,7 +55,7 @@
|
|||||||
|
|
||||||
<div class="topic_notifications m-10 {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">
|
<div class="topic_notifications m-10 {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">
|
||||||
|
|
||||||
<div class="subsection-header inline-block">
|
<div class="subsection-header">
|
||||||
<h3>{{t "Topic notifications" }}
|
<h3>{{t "Topic notifications" }}
|
||||||
{{> ../help_link_widget link="/help/topic-notifications" }}
|
{{> ../help_link_widget link="/help/topic-notifications" }}
|
||||||
</h3>
|
</h3>
|
||||||
@@ -100,7 +100,7 @@
|
|||||||
|
|
||||||
<div class="desktop_notifications m-10 {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">
|
<div class="desktop_notifications m-10 {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">
|
||||||
|
|
||||||
<div class="subsection-header inline-block">
|
<div class="subsection-header">
|
||||||
<h3>{{t "Desktop message notifications" }}
|
<h3>{{t "Desktop message notifications" }}
|
||||||
{{> ../help_link_widget link="/help/desktop-notifications" }}
|
{{> ../help_link_widget link="/help/desktop-notifications" }}
|
||||||
</h3>
|
</h3>
|
||||||
@@ -148,7 +148,7 @@
|
|||||||
|
|
||||||
<div class="mobile_notifications m-10 {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">
|
<div class="mobile_notifications m-10 {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">
|
||||||
|
|
||||||
<div class="subsection-header inline-block">
|
<div class="subsection-header">
|
||||||
<h3>{{t "Mobile message notifications" }}
|
<h3>{{t "Mobile message notifications" }}
|
||||||
{{> ../help_link_widget link="/help/mobile-notifications" }}
|
{{> ../help_link_widget link="/help/mobile-notifications" }}
|
||||||
</h3>
|
</h3>
|
||||||
@@ -175,7 +175,7 @@
|
|||||||
|
|
||||||
<div class="email_message_notifications m-10 {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">
|
<div class="email_message_notifications m-10 {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">
|
||||||
|
|
||||||
<div class="subsection-header inline-block">
|
<div class="subsection-header">
|
||||||
<h3>{{t "Email message notifications" }}
|
<h3>{{t "Email message notifications" }}
|
||||||
{{> ../help_link_widget link="/help/email-notifications" }}
|
{{> ../help_link_widget link="/help/email-notifications" }}
|
||||||
</h3>
|
</h3>
|
||||||
@@ -224,7 +224,7 @@
|
|||||||
|
|
||||||
<div class="other_email_notifications m-10 {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">
|
<div class="other_email_notifications m-10 {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">
|
||||||
|
|
||||||
<div class="subsection-header inline-block">
|
<div class="subsection-header">
|
||||||
<h3>{{t "Other emails" }}</h3>
|
<h3>{{t "Other emails" }}</h3>
|
||||||
{{> settings_save_discard_widget section_name="other-emails-settings" show_only_indicator=(not for_realm_settings) }}
|
{{> settings_save_discard_widget section_name="other-emails-settings" show_only_indicator=(not for_realm_settings) }}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
{{> notification_settings . prefix="realm_" for_realm_settings=true}}
|
{{> notification_settings . prefix="realm_" for_realm_settings=true}}
|
||||||
|
|
||||||
<div class="privacy_settings settings-subsection-parent">
|
<div class="privacy_settings settings-subsection-parent">
|
||||||
<div class="subsection-header inline-block">
|
<div class="subsection-header">
|
||||||
<h3 class="inline-block">{{t "Privacy settings" }}</h3>
|
<h3 class="inline-block">{{t "Privacy settings" }}</h3>
|
||||||
{{> settings_save_discard_widget section_name="privacy-setting" show_only_indicator=false }}
|
{{> settings_save_discard_widget section_name="privacy-setting" show_only_indicator=false }}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<div class="general-settings {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">
|
<div class="general-settings {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">
|
||||||
<!-- this is inline block so that the alert notification can sit beside
|
<!-- this is inline block so that the alert notification can sit beside
|
||||||
it. If there's not an alert, don't make it inline-block.-->
|
it. If there's not an alert, don't make it inline-block.-->
|
||||||
<div class="subsection-header inline-block">
|
<div class="subsection-header">
|
||||||
<h3>{{t "General" }}</h3>
|
<h3>{{t "General" }}</h3>
|
||||||
{{> settings_save_discard_widget section_name="general-settings" show_only_indicator=(not for_realm_settings) }}
|
{{> settings_save_discard_widget section_name="general-settings" show_only_indicator=(not for_realm_settings) }}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user