diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-02-20 15:11:52 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-02-20 15:11:52 +0000 |
| commit | 58d0f9678b749d1b2ef8aa7d6fb4a91da9cf947d (patch) | |
| tree | 6879bff1875d70c4eec0bf893e492e76ac0ff562 /src/components/user_list_popover | |
| parent | ddee8bb686fb18baf5212089653a8b4e40feedd6 (diff) | |
| parent | 86e3aefdab3fa1314d4731eabcf03f8c9e418e41 (diff) | |
Merge branch 'fix-mentions-new-bugs' into 'develop'
Fix newfound bugs with rich mentions + user suggestions
See merge request pleroma/pleroma-fe!1430
Diffstat (limited to 'src/components/user_list_popover')
| -rw-r--r-- | src/components/user_list_popover/user_list_popover.vue | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/components/user_list_popover/user_list_popover.vue b/src/components/user_list_popover/user_list_popover.vue index f4b93c9a..8706d0ff 100644 --- a/src/components/user_list_popover/user_list_popover.vue +++ b/src/components/user_list_popover/user_list_popover.vue @@ -22,7 +22,12 @@ /> <div class="user-list-names"> <!-- eslint-disable vue/no-v-html --> - <span v-html="user.name_html" /> + <RichContent + class="username" + :title="'@'+user.screen_name_ui" + :html="user.name_html" + :emoji="user.emoji" + /> <!-- eslint-enable vue/no-v-html --> <span class="user-list-screen-name">{{ user.screen_name_ui }}</span> </div> @@ -48,6 +53,8 @@ .user-list-popover { padding: 0.5em; + --emoji-size: 16px; + .user-list-row { padding: 0.25em; display: flex; |