From 674cf8eaccecc381438d28df94a243c7dd12ef0b Mon Sep 17 00:00:00 2001 From: Karl Stolley Date: Wed, 15 Mar 2023 15:56:35 -0500 Subject: [PATCH] css: Hyphenate .status-emoji selector. --- web/e2e-tests/user-status.test.ts | 2 +- web/src/emoji_picker.js | 4 ++-- web/src/popovers.js | 2 +- web/src/ui_init.js | 4 ++-- web/styles/popovers.css | 2 +- web/styles/right_sidebar.css | 4 ++-- web/styles/user_status.css | 2 +- web/styles/zulip.css | 2 +- web/templates/emoji_popover_emoji.hbs | 2 +- web/templates/set_status_overlay.hbs | 4 ++-- web/templates/settings/display_settings.hbs | 2 +- web/templates/status_emoji.hbs | 6 +++--- web/templates/user_info_popover_content.hbs | 4 ++-- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/web/e2e-tests/user-status.test.ts b/web/e2e-tests/user-status.test.ts index 453262625e..2de5a83d58 100644 --- a/web/e2e-tests/user-status.test.ts +++ b/web/e2e-tests/user-status.test.ts @@ -60,7 +60,7 @@ async function test_user_status(page: Page): Promise { await page.waitForSelector("#set-user-status-modal", {hidden: true}); // Check if the emoji is added in user presence list. - await page.waitForSelector(`.user-presence-link .status_emoji${tada_emoji_selector}`); + await page.waitForSelector(`.user-presence-link .status-emoji${tada_emoji_selector}`); } async function user_status_test(page: Page): Promise { diff --git a/web/src/emoji_picker.js b/web/src/emoji_picker.js index a4bfa76722..8889482cb0 100644 --- a/web/src/emoji_picker.js +++ b/web/src/emoji_picker.js @@ -303,7 +303,7 @@ function is_composition(emoji) { } function is_status_emoji(emoji) { - return $(emoji).hasClass("status_emoji"); + return $(emoji).hasClass("status-emoji"); } function process_enter_while_filtering(e) { @@ -795,7 +795,7 @@ export function register_click_handlers() { $(".app, .header, .modal__overlay, #set-user-status-modal").css("pointer-events", "none"); }); - $(document).on("click", ".emoji-popover-emoji.status_emoji", function (e) { + $(document).on("click", ".emoji-popover-emoji.status-emoji", function (e) { e.preventDefault(); e.stopPropagation(); hide_emoji_popover(); diff --git a/web/src/popovers.js b/web/src/popovers.js index 9ed6f39caf..8360f4da28 100644 --- a/web/src/popovers.js +++ b/web/src/popovers.js @@ -917,7 +917,7 @@ export function register_click_handlers() { // Clicking on one's own status emoji should open the user status modal. $("#user_presences").on( "click", - ".user_sidebar_entry_me .status_emoji", + ".user_sidebar_entry_me .status-emoji", open_user_status_modal, ); diff --git a/web/src/ui_init.js b/web/src/ui_init.js index 6e6c047ec5..fea2749a56 100644 --- a/web/src/ui_init.js +++ b/web/src/ui_init.js @@ -190,7 +190,7 @@ function initialize_right_sidebar() { } $("#user_presences").on("mouseenter", ".user_sidebar_entry", (e) => { - const $status_emoji = $(e.target).closest(".user_sidebar_entry").find("img.status_emoji"); + const $status_emoji = $(e.target).closest(".user_sidebar_entry").find("img.status-emoji"); if ($status_emoji.length) { const animated_url = $status_emoji.data("animated-url"); if (animated_url) { @@ -200,7 +200,7 @@ function initialize_right_sidebar() { }); $("#user_presences").on("mouseleave", ".user_sidebar_entry", (e) => { - const $status_emoji = $(e.target).closest(".user_sidebar_entry").find("img.status_emoji"); + const $status_emoji = $(e.target).closest(".user_sidebar_entry").find("img.status-emoji"); if ($status_emoji.length) { const still_url = $status_emoji.data("still-url"); if (still_url) { diff --git a/web/styles/popovers.css b/web/styles/popovers.css index 1c039508c1..21cc794d41 100644 --- a/web/styles/popovers.css +++ b/web/styles/popovers.css @@ -784,7 +784,7 @@ ul { .user_info_status_text { opacity: 0.8; - .status_emoji { + .status-emoji { height: 18px; width: 18px; /* Override the default 3px left margin for status emoji, which is diff --git a/web/styles/right_sidebar.css b/web/styles/right_sidebar.css index 036575e5de..336f81baca 100644 --- a/web/styles/right_sidebar.css +++ b/web/styles/right_sidebar.css @@ -114,7 +114,7 @@ $user_status_emoji_width: 24px; .user-presence-link { width: calc(100% - $user_status_emoji_width); - .status_emoji { + .status-emoji { top: 9px; } } @@ -140,7 +140,7 @@ $user_status_emoji_width: 24px; text-overflow: ellipsis; } - .status_emoji { + .status-emoji { line-height: 20px; top: -2px; } diff --git a/web/styles/user_status.css b/web/styles/user_status.css index c9228cb6f4..a7860fcb44 100644 --- a/web/styles/user_status.css +++ b/web/styles/user_status.css @@ -74,7 +74,7 @@ margin-bottom: 10px; line-height: 1.1em; - .status_emoji { + .status-emoji { height: 18px; width: 18px; margin-left: 3px; diff --git a/web/styles/zulip.css b/web/styles/zulip.css index ccbbc89db5..05253ddfdf 100644 --- a/web/styles/zulip.css +++ b/web/styles/zulip.css @@ -2322,7 +2322,7 @@ select.invite-as { top: 3px; } -.status_emoji { +.status-emoji { height: 16px; width: 16px; /* We are setting minimum width here because when the user's name is very long, diff --git a/web/templates/emoji_popover_emoji.hbs b/web/templates/emoji_popover_emoji.hbs index a0b0c7a7ae..428071f30a 100644 --- a/web/templates/emoji_popover_emoji.hbs +++ b/web/templates/emoji_popover_emoji.hbs @@ -1,5 +1,5 @@ {{#with emoji_dict}} -
+
{{#if is_realm_emoji}} {{else}} diff --git a/web/templates/set_status_overlay.hbs b/web/templates/set_status_overlay.hbs index e34ecd1227..7ccbec7907 100644 --- a/web/templates/set_status_overlay.hbs +++ b/web/templates/set_status_overlay.hbs @@ -13,9 +13,9 @@ {{#if emoji.emoji_alt_code}}
 :{{emoji.emoji_name}}:
{{else if emoji.url}} - + {{else}} -
+
{{/if}} {{status_text}} diff --git a/web/templates/settings/display_settings.hbs b/web/templates/settings/display_settings.hbs index dd933a67d1..8695f18628 100644 --- a/web/templates/settings/display_settings.hbs +++ b/web/templates/settings/display_settings.hbs @@ -90,7 +90,7 @@ {{#if (eq this.code 1)}} {{../full_name}} -
+
{{/if}} {{#if (eq this.code 2)}}
diff --git a/web/templates/status_emoji.hbs b/web/templates/status_emoji.hbs index 7cbe263951..6fb31a041b 100644 --- a/web/templates/status_emoji.hbs +++ b/web/templates/status_emoji.hbs @@ -2,11 +2,11 @@ {{#if emoji_alt_code}}  :{{emoji_name}}: {{else if still_url}} - + {{else if url}} {{!-- note that we have no still_url --}} - + {{else if emoji_code}} - + {{/if}} {{/if}} diff --git a/web/templates/user_info_popover_content.hbs b/web/templates/user_info_popover_content.hbs index 48781bdd07..86568cd2ce 100644 --- a/web/templates/user_info_popover_content.hbs +++ b/web/templates/user_info_popover_content.hbs @@ -68,9 +68,9 @@ {{#if status_emoji_info.emoji_alt_code}}
 :{{status_emoji_info.emoji_name}}:
{{else if status_emoji_info.url}} - + {{else}} -
+
{{/if}} {{/if}}