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/chat_title/chat_title.vue | |
| 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/chat_title/chat_title.vue')
| -rw-r--r-- | src/components/chat_title/chat_title.vue | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/components/chat_title/chat_title.vue b/src/components/chat_title/chat_title.vue index b16ed39d..a92028e8 100644 --- a/src/components/chat_title/chat_title.vue +++ b/src/components/chat_title/chat_title.vue @@ -1,5 +1,4 @@ <template> - <!-- eslint-disable vue/no-v-html --> <div class="chat-title" :title="title" @@ -14,12 +13,13 @@ height="23px" /> </router-link> - <span + <RichContent class="username" - v-html="htmlTitle" + :title="'@'+user.screen_name_ui" + :html="htmlTitle" + :emoji="user.emoji" /> </div> - <!-- eslint-enable vue/no-v-html --> </template> <script src="./chat_title.js"></script> @@ -34,6 +34,8 @@ white-space: nowrap; align-items: center; + --emoji-size: 14px; + .username { max-width: 100%; text-overflow: ellipsis; @@ -41,14 +43,6 @@ display: inline; word-wrap: break-word; overflow: hidden; - text-overflow: ellipsis; - - .emoji { - width: 14px; - height: 14px; - vertical-align: middle; - object-fit: contain - } } .Avatar { |