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

css: Hyphenate .status-emoji selector.

This commit is contained in:
Karl Stolley 2023-03-15 15:56:35 -05:00 committed by Tim Abbott
parent f695b08989
commit 674cf8eacc
13 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ async function test_user_status(page: Page): Promise<void> {
await page.waitForSelector("#set-user-status-modal", {hidden: true}); await page.waitForSelector("#set-user-status-modal", {hidden: true});
// Check if the emoji is added in user presence list. // 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<void> { async function user_status_test(page: Page): Promise<void> {

4
web/src/emoji_picker.js
View File

@ -303,7 +303,7 @@ function is_composition(emoji) {
} }
function is_status_emoji(emoji) { function is_status_emoji(emoji) {
return $(emoji).hasClass("status_emoji"); return $(emoji).hasClass("status-emoji");
} }
function process_enter_while_filtering(e) { 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"); $(".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.preventDefault();
e.stopPropagation(); e.stopPropagation();
hide_emoji_popover(); hide_emoji_popover();

2
web/src/popovers.js
View File

@ -917,7 +917,7 @@ export function register_click_handlers() {
// Clicking on one's own status emoji should open the user status modal. // Clicking on one's own status emoji should open the user status modal.
$("#user_presences").on( $("#user_presences").on(
"click", "click",
".user_sidebar_entry_me .status_emoji", ".user_sidebar_entry_me .status-emoji",
open_user_status_modal, open_user_status_modal,
); );

4
web/src/ui_init.js
View File

@ -190,7 +190,7 @@ function initialize_right_sidebar() {
} }
$("#user_presences").on("mouseenter", ".user_sidebar_entry", (e) => { $("#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) { if ($status_emoji.length) {
const animated_url = $status_emoji.data("animated-url"); const animated_url = $status_emoji.data("animated-url");
if (animated_url) { if (animated_url) {
@ -200,7 +200,7 @@ function initialize_right_sidebar() {
}); });
$("#user_presences").on("mouseleave", ".user_sidebar_entry", (e) => { $("#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) { if ($status_emoji.length) {
const still_url = $status_emoji.data("still-url"); const still_url = $status_emoji.data("still-url");
if (still_url) { if (still_url) {

2
web/styles/popovers.css
View File

@ -784,7 +784,7 @@ ul {
.user_info_status_text { .user_info_status_text {
opacity: 0.8; opacity: 0.8;
.status_emoji { .status-emoji {
height: 18px; height: 18px;
width: 18px; width: 18px;
/* Override the default 3px left margin for status emoji, which is /* Override the default 3px left margin for status emoji, which is

4
web/styles/right_sidebar.css
View File

@ -114,7 +114,7 @@ $user_status_emoji_width: 24px;
.user-presence-link { .user-presence-link {
width: calc(100% - $user_status_emoji_width); width: calc(100% - $user_status_emoji_width);
.status_emoji { .status-emoji {
top: 9px; top: 9px;
} }
} }
@ -140,7 +140,7 @@ $user_status_emoji_width: 24px;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.status_emoji { .status-emoji {
line-height: 20px; line-height: 20px;
top: -2px; top: -2px;
} }

2
web/styles/user_status.css
View File

@ -74,7 +74,7 @@
margin-bottom: 10px; margin-bottom: 10px;
line-height: 1.1em; line-height: 1.1em;
.status_emoji { .status-emoji {
height: 18px; height: 18px;
width: 18px; width: 18px;
margin-left: 3px; margin-left: 3px;

2
web/styles/zulip.css
View File

@ -2322,7 +2322,7 @@ select.invite-as {
top: 3px; top: 3px;
} }
.status_emoji { .status-emoji {
height: 16px; height: 16px;
width: 16px; width: 16px;
/* We are setting minimum width here because when the user's name is very long, /* We are setting minimum width here because when the user's name is very long,

2
web/templates/emoji_popover_emoji.hbs
View File

@ -1,5 +1,5 @@
{{#with emoji_dict}} {{#with emoji_dict}}
<div class="emoji-popover-emoji {{#if ../message_id }}{{#if has_reacted}} reacted {{/if}} reaction {{else if ../is_status_emoji_popover}} status_emoji {{else}} composition {{/if}}" data-emoji-name="{{name}}" tabindex="0" data-emoji-id="{{../type}},{{../section}},{{../index}}"> <div class="emoji-popover-emoji {{#if ../message_id }}{{#if has_reacted}} reacted {{/if}} reaction {{else if ../is_status_emoji_popover}} status-emoji {{else}} composition {{/if}}" data-emoji-name="{{name}}" tabindex="0" data-emoji-id="{{../type}},{{../section}},{{../index}}">
{{#if is_realm_emoji}} {{#if is_realm_emoji}}
<img src="{{url}}" class="emoji"/> <img src="{{url}}" class="emoji"/>
{{else}} {{else}}

4
web/templates/set_status_overlay.hbs
View File

@ -13,9 +13,9 @@
{{#if emoji.emoji_alt_code}} {{#if emoji.emoji_alt_code}}
<div class="emoji_alt_code">&nbsp;:{{emoji.emoji_name}}:</div> <div class="emoji_alt_code">&nbsp;:{{emoji.emoji_name}}:</div>
{{else if emoji.url}} {{else if emoji.url}}
<img src="{{emoji.url}}" class="emoji status_emoji" /> <img src="{{emoji.url}}" class="emoji status-emoji" />
{{else}} {{else}}
<div class="emoji status_emoji emoji-{{emoji.emoji_code}}"></div> <div class="emoji status-emoji emoji-{{emoji.emoji_code}}"></div>
{{/if}} {{/if}}
{{status_text}} {{status_text}}
</button> </button>

2
web/templates/settings/display_settings.hbs
View File

@ -90,7 +90,7 @@
<span class="right preview"> <span class="right preview">
{{#if (eq this.code 1)}} {{#if (eq this.code 1)}}
<span class="user-name">{{../full_name}}</span> <span class="user-name">{{../full_name}}</span>
<div class="emoji status_emoji emoji-1f3e0"></div> <div class="emoji status-emoji emoji-1f3e0"></div>
{{/if}} {{/if}}
{{#if (eq this.code 2)}} {{#if (eq this.code 2)}}
<div class="user-name-and-status-text"> <div class="user-name-and-status-text">

6
web/templates/status_emoji.hbs
View File

@ -2,11 +2,11 @@
{{#if emoji_alt_code}} {{#if emoji_alt_code}}
<span class="emoji_alt_code">&nbsp;:{{emoji_name}}:</span> <span class="emoji_alt_code">&nbsp;:{{emoji_name}}:</span>
{{else if still_url}} {{else if still_url}}
<img src="{{still_url}}" class="emoji status_emoji" data-animated-url="{{url}}" data-still-url="{{still_url}}" /> <img src="{{still_url}}" class="emoji status-emoji" data-animated-url="{{url}}" data-still-url="{{still_url}}" />
{{else if url}} {{else if url}}
{{!-- note that we have no still_url --}} {{!-- note that we have no still_url --}}
<img src="{{url}}" class="emoji status_emoji" data-animated-url="{{url}}" /> <img src="{{url}}" class="emoji status-emoji" data-animated-url="{{url}}" />
{{else if emoji_code}} {{else if emoji_code}}
<span class="emoji status_emoji emoji-{{emoji_code}}"></span> <span class="emoji status-emoji emoji-{{emoji_code}}"></span>
{{/if}} {{/if}}
{{/if}} {{/if}}

4
web/templates/user_info_popover_content.hbs
View File

@ -68,9 +68,9 @@
{{#if status_emoji_info.emoji_alt_code}} {{#if status_emoji_info.emoji_alt_code}}
<div class="emoji_alt_code">&nbsp;:{{status_emoji_info.emoji_name}}:</div> <div class="emoji_alt_code">&nbsp;:{{status_emoji_info.emoji_name}}:</div>
{{else if status_emoji_info.url}} {{else if status_emoji_info.url}}
<img src="{{status_emoji_info.url}}" class="emoji status_emoji" /> <img src="{{status_emoji_info.url}}" class="emoji status-emoji" />
{{else}} {{else}}
<div class="emoji status_emoji emoji-{{status_emoji_info.emoji_code}}"></div> <div class="emoji status-emoji emoji-{{status_emoji_info.emoji_code}}"></div>
{{/if}} {{/if}}
{{/if}} {{/if}}
<span class="status_text"> <span class="status_text">