diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-09-09 21:51:39 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-09-09 21:51:39 +0000 |
| commit | 370f1e55adddd60a22bf56a7782ba61f239eb13c (patch) | |
| tree | 3a4c897ac420b8d6ab92b31e2779f88947016eed /src/components/user_profile/user_profile.vue | |
| parent | f35e3d0f3fc1a6bb4ebd77fba1dce0ac27f5b7d7 (diff) | |
| parent | a8a82ad12f2f7b9eb8fe7a57a3a7d503c6bbe2ed (diff) | |
Merge branch 'develop' into 'themeApply'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'src/components/user_profile/user_profile.vue')
| -rw-r--r-- | src/components/user_profile/user_profile.vue | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index aef897ae..726216ff 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -20,20 +20,24 @@ :key="index" class="user-profile-field" > - <!-- eslint-disable vue/no-v-html --> <dt :title="user.fields_text[index].name" class="user-profile-field-name" - @click.prevent="linkClicked" - v-html="field.name" - /> + > + <RichContent + :html="field.name" + :emoji="user.emoji" + /> + </dt> <dd :title="user.fields_text[index].value" class="user-profile-field-value" - @click.prevent="linkClicked" - v-html="field.value" - /> - <!-- eslint-enable vue/no-v-html --> + > + <RichContent + :html="field.value" + :emoji="user.emoji" + /> + </dd> </dl> </div> <tab-switcher |