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

invite: Add bootstrap CSS rules for select elements in invite modal. 

This commit adds bootstrap CSS rules used for select elements in
invite UI in zulip.css.

This change is done so we can safely remove select CSS rules from
bootstrap.css as a part of our process to remove bootstrap.

This commit also adds class to a couple of select elements in invite
UI such that we can use those class to write CSS as using IDs would
lead to the dark-theme background not being applied correctly.
This commit is contained in:
Sahil Batra 2022-12-23 22:17:12 +05:30 committed by Tim Abbott
parent 275da6b300
commit bbcca49a5e
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
static/styles/zulip.css
View File

@ -2488,6 +2488,20 @@ textarea.invitee_emails {
} }
} }
select.invite-expires-in,
select.custom-expiration-time,
select.invite-as {
width: 220px;
height: 30px;
padding: 4px 6px;
color: hsl(0, 0%, 33%);
border-radius: 4px;
border: 1px solid hsl(0, 0%, 80%);
cursor: pointer;
background-color: hsl(0, 0%, 100%);
vertical-align: middle;
}
#invite_status { #invite_status {
display: none; display: none;
} }

4
static/templates/invite_user.hbs
View File

@ -32,7 +32,7 @@
<div class="input-group"> <div class="input-group">
<label for="expires_in">{{t "Invitation expires after" }}</label> <label for="expires_in">{{t "Invitation expires after" }}</label>
<div> <div>
<select id="expires_in"> <select id="expires_in" class="invite-expires-in">
{{#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}}
@ -55,7 +55,7 @@
{{> help_link_widget link="/help/roles-and-permissions" }} {{> help_link_widget link="/help/roles-and-permissions" }}
</label> </label>
<div> <div>
<select id="invite_as"> <select id="invite_as" class="invite-as">
<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}}