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

css: Hyphenate .selected-emoji selector.

This commit is contained in:
Karl Stolley 2023-03-15 13:53:35 -05:00 committed by Tim Abbott
parent 36241e5758
commit 89f45bf50e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/e2e-tests/user-status.test.ts
View File

@ -36,7 +36,7 @@ async function test_user_status(page: Page): Promise<void> {
() => (document.querySelector(".user-status") as HTMLInputElement).value === "In a meeting",
);
// It should select calendar emoji.
await page.waitForSelector(".selected_emoji.emoji-1f4c5");
await page.waitForSelector(".selected-emoji.emoji-1f4c5");
// Clear everything.
await page.click("#clear_status_message_button");
@ -53,7 +53,7 @@ async function test_user_status(page: Page): Promise<void> {
await page.waitForSelector(`.emoji-popover ${tada_emoji_selector}`, {visible: true});
await page.click(`.emoji-popover ${tada_emoji_selector}`);
await page.waitForSelector(".emoji-info-popover", {hidden: true});
await page.waitForSelector(`.selected_emoji${tada_emoji_selector}`);
await page.waitForSelector(`.selected-emoji${tada_emoji_selector}`);
await page.click("#set-user-status-modal .dialog_submit_button");
// It should close the modal after saving.

4
web/styles/user_status.css
View File

@ -27,7 +27,7 @@
border-color: inherit;
cursor: pointer;
.selected_emoji {
.selected-emoji {
width: 20px;
height: 20px;
cursor: pointer;
@ -39,7 +39,7 @@
}
/* For custom emojis and smiley icon to take full width. */
& img.selected_emoji,
& img.selected-emoji,
.smiley_icon {
min-width: 20px;
}

4
web/templates/status_emoji_selector.hbs
View File

@ -2,9 +2,9 @@
{{#if selected_emoji.emoji_alt_code}}
<div class="emoji_alt_code">&nbsp;:{{selected_emoji.emoji_name}}:</div>
{{else if selected_emoji.url}}
<img src="{{selected_emoji.url}}" class="emoji selected_emoji" />
<img src="{{selected_emoji.url}}" class="emoji selected-emoji" />
{{else}}
<div class="emoji selected_emoji emoji-{{selected_emoji.emoji_code}}"></div>
<div class="emoji selected-emoji emoji-{{selected_emoji.emoji_code}}"></div>
{{/if}}
{{else}}
<a type="button" class="smiley_icon show fa fa-smile-o"></a>