Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

settings: Remove dropdown-title class. 

We now use "settings-field-label" and "modal-field-label"
class on label elements in settings and modals respectively
to add the bottom margin which was previously done by
"dropdown-title" class as it is better to have more
generic names to use on label for all type of inputs.
This commit is contained in:
Sahil Batra 2024-03-29 12:24:50 +05:30 committed by Tim Abbott
parent 040486776c
commit 62d2b93079
12 changed files with 41 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/styles/settings.css
View File

@ -1589,11 +1589,7 @@ $option_title_width: 180px;
}
}
/* TODO: Remove .dropdown-title once the more
generic and reusable .settings-field-label has
been placed throughout the settings modals. */
.settings-field-label,
.dropdown-title {
.settings-field-label {
margin-bottom: var(--margin-bottom-field-description);
}

4
web/templates/dialog_change_password.hbs
View File

@ -1,6 +1,6 @@
<form id="change_password_container">
<div class="password-div">
<label for="old_password" class="dropdown-title">{{t "Old password" }}</label>
<label for="old_password" class="modal-field-label">{{t "Old password" }}</label>
<input type="password" autocomplete="off" name="old_password" id="old_password" class="w-200 inline-block modal_password_input" value="" />
<i class="fa fa-eye-slash password_visibility_toggle tippy-zulip-tooltip" role="button" tabindex="0"></i>
<div class="settings-forgot-password">
@ -8,7 +8,7 @@
</div>
</div>
<div class="password-div">
<label for="new_password" class="dropdown-title">{{t "New password" }}</label>
<label for="new_password" class="modal-field-label">{{t "New password" }}</label>
<input type="password" autocomplete="new-password" name="new_password" id="new_password" class="w-200 inline-block modal_password_input" value=""
data-min-length="{{password_min_length}}" data-min-guesses="{{password_min_guesses}}" />
<i class="fa fa-eye-slash password_visibility_toggle tippy-zulip-tooltip" role="button" tabindex="0"></i>

2
web/templates/dropdown_widget_with_label.hbs
View File

@ -1,5 +1,5 @@
<div class="input-group" id="{{widget_name}}_widget_container">
<label class="dropdown-title" for="{{widget_name}}_widget">{{label}}
<label class="settings-field-label" for="{{widget_name}}_widget">{{label}}
{{#if help_link}}{{> help_link_widget link=help_link }}{{/if}}
</label>
<span class="prop-element hide" id="id_{{widget_name}}" data-setting-widget-type="dropdown-list-widget" {{#if value_type}}data-setting-value-type="{{value_type}}"{{/if}}></span>

2
web/templates/settings/account_settings.hbs
View File

@ -99,7 +99,7 @@
prefix="user_"}}
</div>
<div class="input-group">
<label for="email_address_visibility" class="dropdown-title">{{t "Who can access your email address" }}
<label for="email_address_visibility" class="settings-field-label">{{t "Who can access your email address" }}
{{> ../help_link_widget link="/help/configure-email-visibility" }}
</label>
<div id="user_email_address_dropdown_container" class="inline-block {{#unless user_has_email_set}}disabled_setting_tooltip{{/unless}}">

2
web/templates/settings/convert_demo_organization_form.hbs
View File

@ -13,7 +13,7 @@
<p>{{t "You can convert this demo organization to a permanent Zulip organization. All users and message history will be preserved." }}</p>
<form class="subdomain-setting">
<div class="input-group">
<label for="organization_type" class="dropdown-title">{{t "Organization type" }}
<label for="organization_type" class="modal-field-label">{{t "Organization type" }}
{{> ../help_link_widget link="/help/organization-type" }}
</label>
<select name="organization_type" id="add_organization_type" class="modal_select bootstrap-focus-style">

12
web/templates/settings/display_settings.hbs
View File

@ -15,7 +15,7 @@
{{/unless}}
<div class="input-group">
<label for="twenty_four_hour_time" class="dropdown-title">{{ settings_label.twenty_four_hour_time }}</label>
<label for="twenty_four_hour_time" class="settings-field-label">{{ settings_label.twenty_four_hour_time }}</label>
<select name="twenty_four_hour_time" class="setting_twenty_four_hour_time prop-element settings_select bootstrap-focus-style" id="{{prefix}}twenty_four_hour_time" data-setting-widget-type="string">
{{#each twenty_four_hour_time_values}}
<option value='{{ this.value }}'>{{ this.description }}</option>
@ -23,7 +23,7 @@
</select>
</div>
<div class="input-group">
<label for="color_scheme" class="dropdown-title">{{t "Theme" }}</label>
<label for="color_scheme" class="settings-field-label">{{t "Theme" }}</label>
<select name="color_scheme" class="setting_color_scheme prop-element settings_select bootstrap-focus-style" id="{{prefix}}color_scheme" data-setting-widget-type="number">
{{> dropdown_options_widget option_values=color_scheme_values}}
</select>
@ -85,7 +85,7 @@
</div>
<div class="input-group">
<label for="web_mark_read_on_scroll_policy" class="dropdown-title">{{t "Automatically mark messages as read" }}
<label for="web_mark_read_on_scroll_policy" class="settings-field-label">{{t "Automatically mark messages as read" }}
{{> ../help_link_widget link="/help/marking-messages-as-read" }}
</label>
<select name="web_mark_read_on_scroll_policy" class="setting_web_mark_read_on_scroll_policy prop-element settings_select bootstrap-focus-style" id="{{prefix}}web_mark_read_on_scroll_policy" data-setting-widget-type="number">
@ -125,7 +125,7 @@
</div>
<div class="input-group thinner setting-next-is-related">
<label for="web_home_view" class="dropdown-title">{{t "Home view" }}
<label for="web_home_view" class="settings-field-label">{{t "Home view" }}
{{> ../help_link_widget link="/help/configure-home-view" }}
</label>
<select name="web_home_view" class="setting_web_home_view prop-element settings_select bootstrap-focus-style" id="{{prefix}}web_home_view" data-setting-widget-type="string">
@ -140,7 +140,7 @@
prefix=prefix}}
<div class="input-group">
<label for="demote_inactive_streams" class="dropdown-title">{{t "Demote inactive channels" }}
<label for="demote_inactive_streams" class="settings-field-label">{{t "Demote inactive channels" }}
{{> ../help_link_widget link="/help/manage-inactive-streams" }}
</label>
<select name="demote_inactive_streams" class="setting_demote_inactive_streams prop-element settings_select bootstrap-focus-style" id="{{prefix}}demote_inactive_streams" data-setting-widget-type="number">
@ -149,7 +149,7 @@
</div>
<div class="input-group">
<label for="web_stream_unreads_count_display_policy" class="dropdown-title">{{t "Show unread counts for" }}</label>
<label for="web_stream_unreads_count_display_policy" class="settings-field-label">{{t "Show unread counts for" }}</label>
<select name="web_stream_unreads_count_display_policy" class="setting_web_stream_unreads_count_display_policy prop-element bootstrap-focus-style settings_select" id="{{prefix}}web_stream_unreads_count_display_policy" data-setting-widget-type="number">
{{> dropdown_options_widget option_values=web_stream_unreads_count_display_policy_values}}
</select>

8
web/templates/settings/notification_settings.hbs
View File

@ -65,7 +65,7 @@
</div>
<div class="input-group">
<label for="automatically_follow_topics_policy" class="dropdown-title">{{ settings_label.automatically_follow_topics_policy }}</label>
<label for="automatically_follow_topics_policy" class="settings-field-label">{{ settings_label.automatically_follow_topics_policy }}</label>
<select name="automatically_follow_topics_policy" class="setting_automatically_follow_topics_policy prop-element settings_select bootstrap-focus-style"
id="{{prefix}}automatically_follow_topics_policy" data-setting-widget-type="number">
{{> dropdown_options_widget option_values=automatically_follow_topics_policy_values}}
@ -73,7 +73,7 @@
</div>
<div class="input-group">
<label for="automatically_unmute_topics_in_muted_streams_policy" class="dropdown-title">{{ settings_label.automatically_unmute_topics_in_muted_streams_policy }}</label>
<label for="automatically_unmute_topics_in_muted_streams_policy" class="settings-field-label">{{ settings_label.automatically_unmute_topics_in_muted_streams_policy }}</label>
<select name="automatically_unmute_topics_in_muted_streams_policy" class="setting_automatically_unmute_topics_in_muted_streams_policy prop-element settings_select bootstrap-focus-style"
id="{{prefix}}automatically_unmute_topics_in_muted_streams_policy" data-setting-widget-type="number">
{{> dropdown_options_widget option_values=automatically_unmute_topics_in_muted_streams_policy_values}}
@ -128,7 +128,7 @@
</div>
<div class="input-group">
<label for="desktop_icon_count_display" class="dropdown-title">{{ settings_label.desktop_icon_count_display }}</label>
<label for="desktop_icon_count_display" class="settings-field-label">{{ settings_label.desktop_icon_count_display }}</label>
<select name="desktop_icon_count_display" class="setting_desktop_icon_count_display prop-element settings_select bootstrap-focus-style" id="{{prefix}}desktop_icon_count_display" data-setting-widget-type="number">
{{> dropdown_options_widget option_values=desktop_icon_count_display_values}}
</select>
@ -195,7 +195,7 @@
</div>
<div class="input-group">
<label for="realm_name_in_email_notifications_policy" class="dropdown-title">{{ settings_label.realm_name_in_email_notifications_policy }}</label>
<label for="realm_name_in_email_notifications_policy" class="settings-field-label">{{ settings_label.realm_name_in_email_notifications_policy }}</label>
<select name="realm_name_in_email_notifications_policy" class="setting_realm_name_in_email_notifications_policy prop-element settings_select bootstrap-focus-style" id="{{prefix}}realm_name_in_email_notifications_policy" data-setting-widget-type="number">
{{> dropdown_options_widget option_values=realm_name_in_email_notifications_policy_values}}
</select>

32
web/templates/settings/organization_permissions_admin.hbs
View File

@ -16,7 +16,7 @@
prefix="id_"
is_checked=realm_invite_required
label=admin_settings_label.realm_invite_required}}
<label for="realm_invite_to_realm_policy" class="dropdown-title">{{t "Who can send email invitations to new users" }}
<label for="realm_invite_to_realm_policy" class="settings-field-label">{{t "Who can send email invitations to new users" }}
</label>
<select name="realm_invite_to_realm_policy" id="id_realm_invite_to_realm_policy" class="prop-element settings_select bootstrap-focus-style" data-setting-widget-type="number">
{{> dropdown_options_widget option_values=invite_to_realm_policy_values}}
@ -29,7 +29,7 @@
value_type="number"}}
<div class="input-group">
<label for="realm_org_join_restrictions" class="dropdown-title">{{t "Restrict email domains of new users?" }}</label>
<label for="realm_org_join_restrictions" class="settings-field-label">{{t "Restrict email domains of new users?" }}</label>
<select name="realm_org_join_restrictions" id="id_realm_org_join_restrictions" class="prop-element settings_select bootstrap-focus-style">
<option value="no_restriction">{{t "No restrictions" }}</option>
<option value="no_disposable_email">{{t "Don’t allow disposable email addresses" }}</option>
@ -43,7 +43,7 @@
</div>
</div>
<div class="input-group time-limit-setting">
<label for="realm_waiting_period_threshold" class="dropdown-title">
<label for="realm_waiting_period_threshold" class="settings-field-label">
{{t "Waiting period before new members turn into full members" }}
{{> ../help_link_widget link="/help/restrict-permissions-of-new-members" }}
</label>
@ -69,7 +69,7 @@
</div>
<div class="m-10 inline-block organization-permissions-parent">
<div class="input-group">
<label for="realm_create_public_stream_policy" class="dropdown-title">{{t "Who can create public channels" }}</label>
<label for="realm_create_public_stream_policy" class="settings-field-label">{{t "Who can create public channels" }}</label>
<select name="realm_create_public_stream_policy" id="id_realm_create_public_stream_policy" class="prop-element settings_select bootstrap-focus-style" data-setting-widget-type="number">
{{> dropdown_options_widget option_values=common_policy_values}}
</select>
@ -83,25 +83,25 @@
is_disabled=disable_enable_spectator_access_setting
help_link="/help/public-access-option"}}
<div class="input-group realm_create_web_public_stream_policy">
<label for="realm_create_web_public_stream_policy" class="dropdown-title">{{t "Who can create web-public channels" }}</label>
<label for="realm_create_web_public_stream_policy" class="settings-field-label">{{t "Who can create web-public channels" }}</label>
<select name="realm_create_web_public_stream_policy" id="id_realm_create_web_public_stream_policy" class="prop-element settings_select bootstrap-focus-style" data-setting-widget-type="number">
{{> dropdown_options_widget option_values=create_web_public_stream_policy_values}}
</select>
</div>
<div class="input-group">
<label for="realm_create_private_stream_policy" class="dropdown-title">{{t "Who can create private channels" }}</label>
<label for="realm_create_private_stream_policy" class="settings-field-label">{{t "Who can create private channels" }}</label>
<select name="realm_create_private_stream_policy" id="id_realm_create_private_stream_policy" class="prop-element settings_select bootstrap-focus-style" data-setting-widget-type="number">
{{> dropdown_options_widget option_values=common_policy_values}}
</select>
</div>
<div class="input-group">
<label for="realm_invite_to_stream_policy" class="dropdown-title">{{t "Who can add users to channels" }}</label>
<label for="realm_invite_to_stream_policy" class="settings-field-label">{{t "Who can add users to channels" }}</label>
<select name="realm_invite_to_stream_policy" id="id_realm_invite_to_stream_policy" class="prop-element settings_select bootstrap-focus-style" data-setting-widget-type="number">
{{> dropdown_options_widget option_values=common_policy_values}}
</select>
</div>
<div class="input-group">
<label for="realm_wildcard_mention_policy" class="dropdown-title">{{t "Who can notify a large number of users with a wildcard mention" }}
<label for="realm_wildcard_mention_policy" class="settings-field-label">{{t "Who can notify a large number of users with a wildcard mention" }}
{{> ../help_link_widget link="/help/restrict-wildcard-mentions" }}
</label>
<select name="realm_wildcard_mention_policy" id="id_realm_wildcard_mention_policy" class="prop-element settings_select bootstrap-focus-style" data-setting-widget-type="number">
@ -132,7 +132,7 @@
label=admin_settings_label.realm_allow_edit_history}}
<div class="input-group time-limit-setting">
<label for="realm_message_content_edit_limit_seconds" class="dropdown-title">{{t "Time limit for editing messages" }}</label>
<label for="realm_message_content_edit_limit_seconds" class="settings-field-label">{{t "Time limit for editing messages" }}</label>
<select name="realm_message_content_edit_limit_seconds" id="id_realm_message_content_edit_limit_seconds" class="prop-element settings_select bootstrap-focus-style" {{#unless realm_allow_message_editing}}disabled{{/unless}} data-setting-widget-type="time-limit">
{{#each msg_edit_limit_dropdown_values}}
<option value="{{value}}">{{text}}</option>
@ -161,14 +161,14 @@
{{> settings_save_discard_widget section_name="moving-msgs" }}
</div>
<div class="input-group">
<label for="realm_edit_topic_policy" class="dropdown-title">{{t "Who can move messages to another topic" }}</label>
<label for="realm_edit_topic_policy" class="settings-field-label">{{t "Who can move messages to another topic" }}</label>
<select name="realm_edit_topic_policy" id="id_realm_edit_topic_policy" class="prop-element move-message-policy-setting settings_select bootstrap-focus-style" data-setting-widget-type="number">
{{> dropdown_options_widget option_values=edit_topic_policy_values}}
</select>
</div>
<div class="input-group time-limit-setting">
<label for="realm_move_messages_within_stream_limit_seconds" class="dropdown-title">{{t "Time limit for editing topics" }} <i>({{t "does not apply to moderators and administrators" }})</i></label>
<label for="realm_move_messages_within_stream_limit_seconds" class="settings-field-label">{{t "Time limit for editing topics" }} <i>({{t "does not apply to moderators and administrators" }})</i></label>
<select name="realm_move_messages_within_stream_limit_seconds" id="id_realm_move_messages_within_stream_limit_seconds" class="prop-element settings_select" data-setting-widget-type="time-limit">
{{#each msg_move_limit_dropdown_values}}
<option value="{{value}}">{{text}}</option>
@ -194,7 +194,7 @@
</div>
<div class="input-group time-limit-setting">
<label for="realm_move_messages_between_streams_limit_seconds" class="dropdown-title">{{t "Time limit for moving messages between channels" }} <i>({{t "does not apply to moderators and administrators" }})</i></label>
<label for="realm_move_messages_between_streams_limit_seconds" class="settings-field-label">{{t "Time limit for moving messages between channels" }} <i>({{t "does not apply to moderators and administrators" }})</i></label>
<select name="realm_move_messages_between_streams_limit_seconds" id="id_realm_move_messages_between_streams_limit_seconds" class="prop-element bootstrap-focus-style settings_select" data-setting-widget-type="time-limit">
{{#each msg_move_limit_dropdown_values}}
<option value="{{value}}">{{text}}</option>
@ -224,7 +224,7 @@
{{t "Administrators can delete any message." }}
</label>
<div class="input-group">
<label for="realm_delete_own_message_policy" class="dropdown-title">
<label for="realm_delete_own_message_policy" class="settings-field-label">
{{t "Who can delete their own messages" }}
</label>
<select name="realm_delete_own_message_policy" id="id_realm_delete_own_message_policy" class="prop-element bootstrap-focus-style settings_select" data-setting-widget-type="number">
@ -233,7 +233,7 @@
</div>
<div class="input-group time-limit-setting">
<label for="realm_message_content_delete_limit_seconds" class="dropdown-title">
<label for="realm_message_content_delete_limit_seconds" class="settings-field-label">
{{t "Time limit for deleting messages" }} <i>({{t "does not apply to administrators" }})</i>
</label>
<select name="realm_message_content_delete_limit_seconds" id="id_realm_message_content_delete_limit_seconds" class="prop-element bootstrap-focus-style settings_select" data-setting-widget-type="time-limit">
@ -325,14 +325,14 @@
</div>
<div class="input-group">
<label for="realm_user_group_edit_policy" class="dropdown-title">{{t "Who can create and manage user groups" }}</label>
<label for="realm_user_group_edit_policy" class="settings-field-label">{{t "Who can create and manage user groups" }}</label>
<select name="realm_user_group_edit_policy" id="id_realm_user_group_edit_policy" class="prop-element settings_select bootstrap-focus-style" data-setting-widget-type="number">
{{> dropdown_options_widget option_values=common_policy_values}}
</select>
</div>
<div class="input-group">
<label for="realm_add_custom_emoji_policy" class="dropdown-title">{{t "Who can add custom emoji" }}</label>
<label for="realm_add_custom_emoji_policy" class="settings-field-label">{{t "Who can add custom emoji" }}</label>
<select name="realm_add_custom_emoji_policy" class="setting-widget prop-element settings_select bootstrap-focus-style" id="id_realm_add_custom_emoji_policy" data-setting-widget-type="number">
{{> dropdown_options_widget option_values=common_policy_values}}
</select>

2
web/templates/settings/organization_profile_admin.hbs
View File

@ -18,7 +18,7 @@
value="{{ realm_name }}" maxlength="40" />
</div>
<div class="input-group admin-realm">
<label for="realm_org_type" class="dropdown-title">{{t "Organization type" }}
<label for="realm_org_type" class="settings-field-label">{{t "Organization type" }}
{{> ../help_link_widget link="/help/organization-type" }}
</label>
<select name="realm_org_type" class="setting-widget prop-element settings_select bootstrap-focus-style" id="id_realm_org_type" data-setting-widget-type="number">

10
web/templates/settings/organization_settings_admin.hbs
View File

@ -50,7 +50,7 @@
label=admin_settings_label.realm_digest_emails_enabled}}
{{/if}}
<div class="input-group">
<label for="realm_digest_weekday" class="dropdown-title">{{t "Day of the week to send digests" }}</label>
<label for="realm_digest_weekday" class="settings-field-label">{{t "Day of the week to send digests" }}</label>
<select name="realm_digest_weekday"
id="id_realm_digest_weekday"
class="setting-widget prop-element settings_select bootstrap-focus-style"
@ -79,7 +79,7 @@
<div class="inline-block organization-settings-parent">
<div class="input-group time-limit-setting">
<label for="id_realm_message_retention_days" class="dropdown-title">{{t "Message retention period" }}
<label for="id_realm_message_retention_days" class="settings-field-label">{{t "Message retention period" }}
</label>
<select name="realm_message_retention_days"
id="id_realm_message_retention_days" class="prop-element settings_select bootstrap-focus-style"
@ -110,7 +110,7 @@
</div>
<div class="inline-block organization-settings-parent">
<div class="input-group">
<label for="realm_video_chat_provider" class="dropdown-title">
<label for="realm_video_chat_provider" class="settings-field-label">
{{t 'Call provider' }}
{{> ../help_link_widget link="/help/start-a-call" }}
</label>
@ -122,7 +122,7 @@
<div class="dependent-settings-block" id="realm_jitsi_server_url_setting">
<div>
<label for="id_realm_jitsi_server_url" class="dropdown-title">
<label for="id_realm_jitsi_server_url" class="settings-field-label">
{{t "Jitsi server URL" }}
{{> ../help_link_widget link="/help/start-a-call#configure-a-self-hosted-instance-of-jitsi-meet" }}
</label>
@ -148,7 +148,7 @@
</div>
</div>
<div class="input-group">
<label for="realm_giphy_rating" class="dropdown-title">
<label for="realm_giphy_rating" class="settings-field-label">
{{t 'GIPHY integration' }}
{{> ../help_link_widget link=giphy_help_link }}
</label>

2
web/templates/settings/organization_user_settings_defaults.hbs
View File

@ -40,7 +40,7 @@
help_link="/help/read-receipts"}}
<div class="input-group">
<label for="email_address_visibility" class="dropdown-title">{{t "Who can access user's email address" }}
<label for="email_address_visibility" class="settings-field-label">{{t "Who can access user's email address" }}
{{> ../help_link_widget link="/help/configure-email-visibility" }}
</label>
<select name="email_address_visibility" class="email_address_visibility prop-element settings_select bootstrap-focus-style" data-setting-widget-type="number"

4
web/templates/stream_settings/stream_types.hbs
View File

@ -27,7 +27,7 @@
</div>
<div class="input-group">
<label class="dropdown-title">{{t 'Who can post to the channel?'}}
<label class="settings-field-label">{{t 'Who can post to the channel?'}}
{{> ../help_link_widget link="/help/stream-sending-policy" }}
</label>
<select name="stream-post-policy" class="stream_post_policy_setting prop-element settings_select bootstrap-focus-style" id="id_stream_post_policy" data-setting-widget-type="number">
@ -47,7 +47,7 @@
{{#if (or is_owner is_stream_edit)}}
<div>
<div class="input-group inline-block message-retention-setting-group time-limit-setting">
<label class="dropdown-title">{{t "Message retention period" }}
<label class="settings-field-label">{{t "Message retention period" }}
{{> ../help_link_widget link="/help/message-retention-policy" }}
</label>