diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-03-20 20:31:20 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-03-20 20:31:20 +0000 |
| commit | fa532b1f005220743d036b7d103c47a043be7ae4 (patch) | |
| tree | 09d5e4d409f7298a328e3feaac6a062e9082df4d /src/components/notification | |
| parent | 19618db1929f1aea6183de3102581844298d1d39 (diff) | |
| parent | 493120b5456282756d05d9afaf66b11a2f87d8fc (diff) | |
Merge branch 'pleroma-akkoma-emoji-port' into 'develop'
Custom emoji reaction support
See merge request pleroma/pleroma-fe!1792
Diffstat (limited to 'src/components/notification')
| -rw-r--r-- | src/components/notification/notification.vue | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index e1ea42ad..4d801c5e 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -121,7 +121,16 @@ scope="global" keypath="notifications.reacted_with" > - <span class="emoji-reaction-emoji">{{ notification.emoji }}</span> + <img + v-if="notification.emoji_url" + class="emoji-reaction-emoji emoji-reaction-emoji-image" + :src="notification.emoji_url" + :name="notification.emoji" + > + <span + v-else + class="emoji-reaction-emoji" + >{{ notification.emoji }}</span> </i18n-t> </small> </span> @@ -153,9 +162,9 @@ </router-link> <button class="button-unstyled expand-icon" - @click.prevent="toggleStatusExpanded" - :title="$t('tool_tip.toggle_expand')" :aria-expanded="statusExpanded" + :title="$t('tool_tip.toggle_expand')" + @click.prevent="toggleStatusExpanded" > <FAIcon class="fa-scale-110" |