IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UI: ensures emojis are correctly aligned in reactions (#24814)

Browse Source 
Co-authored-by: chapoi <101828855+chapoi@users.noreply.github.com>
This commit is contained in:
Joffrey JAFFEUX 2023-12-11 14:29:16 +01:00 committed by GitHub
parent 72872297f5
commit 2e25e95ce1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/chat/assets/stylesheets/common/chat-message.scss
View File

@ -27,8 +27,12 @@
[data-content][data-identifier="chat-message-reaction-tooltip"] { [data-content][data-identifier="chat-message-reaction-tooltip"] {
font-size: var(--font-down-1); font-size: var(--font-down-1);
.fk-d-tooltip__inner-content {
display: block;
}
.emoji { .emoji {
padding-left: 0.5rem; padding-left: 0.25rem;
} }
} }

18
plugins/chat/config/locales/client.en.yml
View File

@ -424,17 +424,17 @@ en:
type: "Chat message" type: "Chat message"
reactions: reactions:
only_you: "You reacted with :%{emoji}:" only_you: "<span>You reacted with </span>:%{emoji}:"
you_and_single_user: "You and %{username} reacted with :%{emoji}:" you_and_single_user: "<span>You and %{username} reacted with </span>:%{emoji}:"
you_and_multiple_users: "You, %{commaSeparatedUsernames} and %{username} reacted with :%{emoji}:" you_and_multiple_users: "<span>You, %{commaSeparatedUsernames} and %{username} reacted with </span>:%{emoji}:"
you_multiple_users_and_more: you_multiple_users_and_more:
one: "You, %{commaSeparatedUsernames} and %{count} other reacted with :%{emoji}:" one: "<span>You, %{commaSeparatedUsernames} and %{count} other reacted with </span>:%{emoji}:"
other: "You, %{commaSeparatedUsernames} and %{count} others reacted with :%{emoji}:" other: "<span>You, %{commaSeparatedUsernames} and %{count} others reacted with </span>:%{emoji}:"
single_user: "%{username} reacted with :%{emoji}:" single_user: "<span>%{username} reacted with </span>:%{emoji}:"
multiple_users: "%{commaSeparatedUsernames} and %{username} reacted with :%{emoji}:" multiple_users: "<span>%{commaSeparatedUsernames} and %{username} reacted with </span>:%{emoji}:"
multiple_users_and_more: multiple_users_and_more:
one: "%{commaSeparatedUsernames} and %{count} other reacted with :%{emoji}:" one: "<span>%{commaSeparatedUsernames} and %{count} other reacted with </span>:%{emoji}:"
other: "%{commaSeparatedUsernames} and %{count} others reacted with :%{emoji}:" other: "<span>%{commaSeparatedUsernames} and %{count} others reacted with </span>:%{emoji}:"
composer: composer:
toggle_toolbar: "Toggle toolbar" toggle_toolbar: "Toggle toolbar"

24
plugins/chat/test/javascripts/unit/lib/get-reaction-text-test.js
View File

@ -23,7 +23,7 @@ module("Discourse Chat | Unit | get-reaction-text", function () {
assert.strictEqual( assert.strictEqual(
getReactionText(reaction, currentUser), getReactionText(reaction, currentUser),
"You reacted with :heart:" "<span>You reacted with </span>:heart:"
); );
}); });
@ -38,7 +38,7 @@ module("Discourse Chat | Unit | get-reaction-text", function () {
assert.strictEqual( assert.strictEqual(
getReactionText(reaction, currentUser), getReactionText(reaction, currentUser),
"You and martin reacted with :heart:" "<span>You and martin reacted with </span>:heart:"
); );
}); });
@ -55,7 +55,7 @@ module("Discourse Chat | Unit | get-reaction-text", function () {
assert.strictEqual( assert.strictEqual(
getReactionText(reaction, currentUser), getReactionText(reaction, currentUser),
"You, user0, user1, user2, user3, user4, user5, user6, user7, user8, user9, user10, user11, user12, user13, user14 and 1 other reacted with :heart:" "<span>You, user0, user1, user2, user3, user4, user5, user6, user7, user8, user9, user10, user11, user12, user13, user14 and 1 other reacted with </span>:heart:"
); );
}); });
@ -72,7 +72,7 @@ module("Discourse Chat | Unit | get-reaction-text", function () {
assert.strictEqual( assert.strictEqual(
getReactionText(reaction, currentUser), getReactionText(reaction, currentUser),
"You, user0, user1, user2, user3, user4, user5, user6, user7, user8, user9, user10, user11 and user12 reacted with :heart:" "<span>You, user0, user1, user2, user3, user4, user5, user6, user7, user8, user9, user10, user11 and user12 reacted with </span>:heart:"
); );
}); });
@ -86,7 +86,7 @@ module("Discourse Chat | Unit | get-reaction-text", function () {
assert.strictEqual( assert.strictEqual(
getReactionText(reaction, currentUser), getReactionText(reaction, currentUser),
"You reacted with :heart:" "<span>You reacted with </span>:heart:"
); );
}); });
@ -101,7 +101,7 @@ module("Discourse Chat | Unit | get-reaction-text", function () {
assert.strictEqual( assert.strictEqual(
getReactionText(reaction, currentUser), getReactionText(reaction, currentUser),
"You and martin reacted with :heart:" "<span>You and martin reacted with </span>:heart:"
); );
}); });
@ -118,7 +118,7 @@ module("Discourse Chat | Unit | get-reaction-text", function () {
assert.strictEqual( assert.strictEqual(
getReactionText(reaction, currentUser), getReactionText(reaction, currentUser),
"You, user0, user1, user2, user3, user4, user5, user6, user7, user8, user9, user10, user11, user12, user13, user14 and 1 other reacted with :heart:" "<span>You, user0, user1, user2, user3, user4, user5, user6, user7, user8, user9, user10, user11, user12, user13, user14 and 1 other reacted with </span>:heart:"
); );
}); });
@ -135,7 +135,7 @@ module("Discourse Chat | Unit | get-reaction-text", function () {
assert.strictEqual( assert.strictEqual(
getReactionText(reaction, currentUser), getReactionText(reaction, currentUser),
"You, user0, user1, user2, user3, user4, user5, user6, user7, user8, user9, user10, user11 and user12 reacted with :heart:" "<span>You, user0, user1, user2, user3, user4, user5, user6, user7, user8, user9, user10, user11 and user12 reacted with </span>:heart:"
); );
}); });
@ -148,7 +148,7 @@ module("Discourse Chat | Unit | get-reaction-text", function () {
assert.strictEqual( assert.strictEqual(
getReactionText(reaction, fabricators.user()), getReactionText(reaction, fabricators.user()),
"martin reacted with :heart:" "<span>martin reacted with </span>:heart:"
); );
}); });
@ -162,7 +162,7 @@ module("Discourse Chat | Unit | get-reaction-text", function () {
assert.strictEqual( assert.strictEqual(
getReactionText(reaction, fabricators.user()), getReactionText(reaction, fabricators.user()),
"claude and martin reacted with :heart:" "<span>claude and martin reacted with </span>:heart:"
); );
}); });
@ -177,7 +177,7 @@ module("Discourse Chat | Unit | get-reaction-text", function () {
assert.strictEqual( assert.strictEqual(
getReactionText(reaction, fabricators.user()), getReactionText(reaction, fabricators.user()),
"user0, user1, user2, user3, user4, user5, user6, user7, user8, user9, user10, user11, user12, user13, user14 and 1 other reacted with :heart:" "<span>user0, user1, user2, user3, user4, user5, user6, user7, user8, user9, user10, user11, user12, user13, user14 and 1 other reacted with </span>:heart:"
); );
}); });
@ -192,7 +192,7 @@ module("Discourse Chat | Unit | get-reaction-text", function () {
assert.strictEqual( assert.strictEqual(
getReactionText(reaction, fabricators.user()), getReactionText(reaction, fabricators.user()),
"user0, user1, user2, user3, user4, user5, user6, user7, user8, user9, user10, user11, user12 and user13 reacted with :heart:" "<span>user0, user1, user2, user3, user4, user5, user6, user7, user8, user9, user10, user11, user12 and user13 reacted with </span>:heart:"
); );
}); });
}); });