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

settings: Rename dependent-block class to dependent-settings-block. 

This commit renames dependent-block class to dependent-settings-block
and also moves the CSS to app_components.css. This class will now
only be used for this particular type of custom inputs and thus
we do not need ID in the selectors for applying the CSS.
This commit is contained in:
Sahil Batra 2022-11-21 16:09:51 +05:30 committed by Tim Abbott
parent 30f4e67aaa
commit ec1f41eb9d
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
static/styles/app_components.css
View File

@ -448,6 +448,10 @@ div.overlay {
} }
} }
.dependent-settings-block {
margin: 15px 0 -5px 23px;
}
@media (width < $md_min) { @media (width < $md_min) {
/* Override Bootstrap's responsive grid to display input at full width */ /* Override Bootstrap's responsive grid to display input at full width */
.input-append .stream-list-filter { .input-append .stream-list-filter {

5
static/styles/zulip.css
View File

@ -894,11 +894,6 @@ li.actual-dropdown-menu i {
padding: 6px 12px; padding: 6px 12px;
} }
#settings_content .dependent-block,
#invite-user .dependent-block {
margin: 15px 0 -5px 23px;
}
.message_area_padder { .message_area_padder {
/* The height of the header and the message_view_header plus a small gap */ /* The height of the header and the message_view_header plus a small gap */
margin-top: 57px; margin-top: 57px;

2
static/templates/invite_user.hbs
View File

@ -39,7 +39,7 @@
</select> </select>
</div> </div>
<p id="expires_on"></p> <p id="expires_on"></p>
<div id="custom-invite-expiration-time" class="dependent-block"> <div id="custom-invite-expiration-time" class="dependent-settings-block">
<label for="expires_in">{{t "Custom time" }}</label> <label for="expires_in">{{t "Custom time" }}</label>
<input type="text" autocomplete="off" name="custom-expiration-time" id="custom-expiration-time-input" class="custom-expiration-time inline-block" value="{{time_input}}" maxlength="3"/> <input type="text" autocomplete="off" name="custom-expiration-time" id="custom-expiration-time-input" class="custom-expiration-time inline-block" value="{{time_input}}" maxlength="3"/>
<select class="custom-expiration-time" id="custom-expiration-time-unit"> <select class="custom-expiration-time" id="custom-expiration-time-unit">

2
static/templates/settings/notification_settings.hbs
View File

@ -134,7 +134,7 @@
<option value="{{ this.value }}">{{ this.description }}</option> <option value="{{ this.value }}">{{ this.description }}</option>
{{/each}} {{/each}}
</select> </select>
<div class="dependent-block"> <div class="dependent-settings-block">
<label for="email_notification_batching_period_edit_minutes" class="inline-block"> <label for="email_notification_batching_period_edit_minutes" class="inline-block">
{{t 'Delay period (minutes)' }}: {{t 'Delay period (minutes)' }}:
</label> </label>

8
static/templates/settings/organization_permissions_admin.hbs
View File

@ -28,7 +28,7 @@
<option value="no_disposable_email">{{t "Don’t allow disposable email addresses" }}</option> <option value="no_disposable_email">{{t "Don’t allow disposable email addresses" }}</option>
<option value="only_selected_domain">{{t "Restrict to a list of domains" }}</option> <option value="only_selected_domain">{{t "Restrict to a list of domains" }}</option>
</select> </select>
<div class="dependent-block"> <div class="dependent-settings-block">
<p id="allowed_domains_label" class="inline-block"></p> <p id="allowed_domains_label" class="inline-block"></p>
{{#if is_owner }} {{#if is_owner }}
<a id="show_realm_domains_modal" role="button">{{t "[Configure]" }}</a> <a id="show_realm_domains_modal" role="button">{{t "[Configure]" }}</a>
@ -46,7 +46,7 @@
<option value="custom_days">{{t "Custom" }}</option> <option value="custom_days">{{t "Custom" }}</option>
</select> </select>
{{!-- This setting is hidden unless `custom_days` --}} {{!-- This setting is hidden unless `custom_days` --}}
<div class="dependent-block"> <div class="dependent-settings-block">
<label for="id_realm_waiting_period_threshold" class="inline-block">{{t "Waiting period (days)" }}:</label> <label for="id_realm_waiting_period_threshold" class="inline-block">{{t "Waiting period (days)" }}:</label>
<input type="text" id="id_realm_waiting_period_threshold" <input type="text" id="id_realm_waiting_period_threshold"
name="realm_waiting_period_threshold" name="realm_waiting_period_threshold"
@ -161,7 +161,7 @@
<option value="{{value}}">{{text}}</option> <option value="{{value}}">{{text}}</option>
{{/each}} {{/each}}
</select> </select>
<div class="dependent-block"> <div class="dependent-settings-block">
<label for="id_realm_message_content_edit_limit_minutes" class="inline-block realm-time-limit-label"> <label for="id_realm_message_content_edit_limit_minutes" class="inline-block realm-time-limit-label">
{{t 'Duration editing is allowed after posting (minutes)'}}:&nbsp; {{t 'Duration editing is allowed after posting (minutes)'}}:&nbsp;
</label> </label>
@ -226,7 +226,7 @@
<option value="{{value}}">{{text}}</option> <option value="{{value}}">{{text}}</option>
{{/each}} {{/each}}
</select> </select>
<div class="dependent-block"> <div class="dependent-settings-block">
<label for="id_realm_message_content_delete_limit_minutes" class="inline-block realm-time-limit-label"> <label for="id_realm_message_content_delete_limit_minutes" class="inline-block realm-time-limit-label">
{{t "Duration deletion is allowed after posting (minutes)" }}: {{t "Duration deletion is allowed after posting (minutes)" }}:
</label> </label>