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

invite-user-modal: Remove duplicate CSS rules. 

Removes some CSS rules used in the invite user modal that were
already being applied via the shared `modal_select` class.

Co-authored-by: Lauryn Menard <lauryn@zulip.com>
This commit is contained in:
Ujjawal Modi 2023-07-26 14:32:02 +05:30 committed by Tim Abbott
parent 15accfc983
commit cdbc20d304
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/styles/zulip.css
View File

@ -1578,17 +1578,7 @@ div.toggle_resolve_topic_spinner .loading_indicator_spinner {
margin: 0; margin: 0;
} }
select.invite-expires-in, .invite-user-select {
select.custom-expiration-time,
select.invite-as {
width: 220px;
height: 30px;
padding: 0 6px;
color: hsl(0deg 0% 33%);
border-radius: 4px;
border: 1px solid hsl(0deg 0% 80%);
cursor: pointer;
background-color: hsl(0deg 0% 100%);
vertical-align: middle; vertical-align: middle;
} }

6
web/templates/invite_user_modal.hbs
View File

@ -28,7 +28,7 @@
</div> </div>
<div class="input-group"> <div class="input-group">
<label for="expires_in" class="modal-field-label">{{t "Invitation expires after" }}</label> <label for="expires_in" class="modal-field-label">{{t "Invitation expires after" }}</label>
<select id="expires_in" class="invite-expires-in modal_select bootstrap-focus-style"> <select id="expires_in" class="invite-user-select modal_select bootstrap-focus-style">
{{#each expires_in_options}} {{#each expires_in_options}}
<option {{#if this.default }}selected{{/if}} name="expires_in" value="{{this.value}}">{{this.description}}</option> <option {{#if this.default }}selected{{/if}} name="expires_in" value="{{this.value}}">{{this.description}}</option>
{{/each}} {{/each}}
@ -37,7 +37,7 @@
<div id="custom-invite-expiration-time" class="dependent-settings-block"> <div id="custom-invite-expiration-time" class="dependent-settings-block">
<label for="expires_in" class="modal-field-label">{{t "Custom time" }}</label> <label for="expires_in" class="modal-field-label">{{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="" maxlength="3"/> <input type="text" autocomplete="off" name="custom-expiration-time" id="custom-expiration-time-input" class="custom-expiration-time inline-block" value="" maxlength="3"/>
<select class="custom-expiration-time modal_select bootstrap-focus-style" id="custom-expiration-time-unit"> <select class="custom-expiration-time invite-user-select modal_select bootstrap-focus-style" id="custom-expiration-time-unit">
{{#each time_choices}} {{#each time_choices}}
<option name="custom_time_choice" class="custom_time_choice" value="{{this}}">{{this}}</option> <option name="custom_time_choice" class="custom_time_choice" value="{{this}}">{{this}}</option>
{{/each}} {{/each}}
@ -49,7 +49,7 @@
<label for="invite_as" class="modal-field-label">{{t "Users join as" }} <label for="invite_as" class="modal-field-label">{{t "Users join as" }}
{{> help_link_widget link="/help/roles-and-permissions" }} {{> help_link_widget link="/help/roles-and-permissions" }}
</label> </label>
<select id="invite_as" class="invite-as modal_select bootstrap-focus-style"> <select id="invite_as" class="invite-user-select modal_select bootstrap-focus-style">
<option name="invite_as" value="{{ invite_as_options.guest.code }}">{{t "Guests" }}</option> <option name="invite_as" value="{{ invite_as_options.guest.code }}">{{t "Guests" }}</option>
<option name="invite_as" selected="selected" value="{{ invite_as_options.member.code }}">{{t "Members" }}</option> <option name="invite_as" selected="selected" value="{{ invite_as_options.member.code }}">{{t "Members" }}</option>
{{#if is_admin}} {{#if is_admin}}