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

invite: Re-add bootstrap CSS for custom expiration text input. 

This commit re-adds bootstrap CSS for custom expiration time
input in invite modal.

We also need to add the code to handle dark theme CSS here to
make sure the CSS for dark theme is prioritized correctly.

This commit also refactors the CSS to modify the selectors to
be simple and remove unnecessary IDs.
This commit is contained in:
Sahil Batra 2023-06-20 09:23:00 +05:30 committed by Tim Abbott
parent 04debf72df
commit 1db5ebae53
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/styles/dark_theme.css
View File

@ -479,7 +479,8 @@
.new-style .tab-switcher .ind-tab:not(.selected), .new-style .tab-switcher .ind-tab:not(.selected),
select, select,
.pill-container, .pill-container,
.user-status-content-wrapper { .user-status-content-wrapper,
#custom-expiration-time-input {
background-color: hsl(0deg 0% 0% / 20%); background-color: hsl(0deg 0% 0% / 20%);
border-color: hsl(0deg 0% 0% / 60%); border-color: hsl(0deg 0% 0% / 60%);
color: inherit; color: inherit;

34
web/styles/zulip.css
View File

@ -2411,11 +2411,9 @@ textarea.invitee_emails {
} }
} }
#invite-user-modal { #custom-expiration-time-input,
#custom-expiration-time-input, #invite-user-form {
#invite-user-form { margin: 0;
margin: 0;
}
} }
select.invite-expires-in, select.invite-expires-in,
@ -2468,17 +2466,29 @@ select.invite-as {
width: fit-content; width: fit-content;
} }
#custom-invite-expiration-time { #custom-expiration-time-input {
#custom-expiration-time-input { width: 5ch;
width: 5ch; margin-right: 15px;
margin-right: 15px;
}
#custom-expiration-time-unit { padding: 4px 6px;
width: auto; color: hsl(0deg 0% 33%);
border-radius: 4px;
border: 1px solid hsl(0deg 0% 80%);
box-shadow: inset 0 1px 1px hsl(0deg 0% 0% / 7.5%);
transition: border linear 0.2s, box-shadow linear 0.2s;
&:focus {
border-color: hsl(206deg 80% 62% / 80%);
outline: 0;
box-shadow: inset 0 1px 1px hsl(0deg 0% 0% / 7.5%),
0 0 8px hsl(206deg 80% 62% / 60%);
} }
} }
#custom-expiration-time-unit {
width: auto;
}
.empty_feed_notice { .empty_feed_notice {
padding: 3em 1em; padding: 3em 1em;
text-align: center; text-align: center;