From 1d979cfddf9b2e0178bb0fadbc54104a40590321 Mon Sep 17 00:00:00 2001 From: Maksim Sukharev Date: Mon, 4 Nov 2024 19:28:51 +0100 Subject: [PATCH] style: fix e-mail guests icons - do not show as mail in mentions - show correct color in popover --- css/icons.css | 9 +++++++++ .../MessagesGroup/Message/MessagePart/Mention.vue | 5 ----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/css/icons.css b/css/icons.css index 35b28cdffd73..f4c219a17de0 100644 --- a/css/icons.css +++ b/css/icons.css @@ -4,6 +4,7 @@ */ .app-talk .icon-user, .modal-mask .icon-user, +.v-popper__popper .icon-user, .talk-sidebar-callview .icon-user, #talk-panel .icon-user, #talk-sidebar .icon-user, @@ -14,6 +15,7 @@ .app-talk .icon-public, .modal-mask .icon-public, +.v-popper__popper .icon-public, .talk-sidebar-callview .icon-public, #talk-panel .icon-public, #talk-sidebar .icon-public, @@ -24,6 +26,7 @@ .app-talk .icon-contacts, .modal-mask .icon-contacts, +.v-popper__popper .icon-contacts, .talk-sidebar-callview .icon-contacts, #talk-panel .icon-contacts, #talk-sidebar .icon-contacts, @@ -34,6 +37,7 @@ .app-talk .icon-phone, .modal-mask .icon-phone, +.v-popper__popper .icon-phone, .talk-sidebar-callview .icon-phone, #talk-panel .icon-phone, #talk-sidebar .icon-phone, @@ -44,6 +48,7 @@ .app-talk .icon-password, .modal-mask .icon-password, +.v-popper__popper .icon-password, .talk-sidebar-callview .icon-password, #talk-panel .icon-password, #talk-sidebar .icon-password, @@ -54,6 +59,7 @@ .app-talk .icon-file, .modal-mask .icon-file, +.v-popper__popper .icon-file, .talk-sidebar-callview .icon-file, #talk-panel .icon-file, #talk-sidebar .icon-file, @@ -64,6 +70,7 @@ .app-talk .icon-mail, .modal-mask .icon-mail, +.v-popper__popper .icon-mail, .talk-sidebar-callview .icon-mail, #talk-panel .icon-mail, #talk-sidebar .icon-mail, @@ -74,6 +81,7 @@ .app-talk .icon-team, .modal-mask .icon-team, +.v-popper__popper .icon-team, .talk-sidebar-callview .icon-team, #talk-panel .icon-team, #talk-sidebar .icon-team, @@ -84,6 +92,7 @@ .app-talk .icon-changelog, .modal-mask .icon-changelog, +.v-popper__popper .icon-changelog, .talk-sidebar-callview .icon-changelog, #talk-panel .icon-changelog, #talk-sidebar .icon-changelog, diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/Mention.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/Mention.vue index 2aeede5b5f16..3774dbfe627b 100644 --- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/Mention.vue +++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/Mention.vue @@ -74,9 +74,6 @@ export default { isGroupMention() { return this.type === 'user-group' || this.type === 'group' }, - isEmailGuest() { - return this.type === 'guest' && this.id.startsWith('email/') - }, isMentionToGuest() { return this.type === 'guest' }, @@ -117,8 +114,6 @@ export default { : 'icon-user-forced-white' } else if (this.isGroupMention) { return 'icon-group-forced-white' - } else if (this.isEmailGuest) { - return 'icon-mail-forced-white' } else if (this.isMentionToGuest) { return 'icon-user-forced-white' } else if (!this.isMentionToAll) {