diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-07-31 17:57:32 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-07-31 17:57:32 +0000 |
| commit | 33ad712852088f8b99a82ec561733d41d63b0034 (patch) | |
| tree | 75eea24b29b4204b57e38aec8223e91a1f1526fe /src/components/basic_user_card/basic_user_card.vue | |
| parent | 0b88c56aa674ad19be7e7e883a3687ec89569940 (diff) | |
| parent | 36aae1635ad370ecf4d22ae6d62cbbba6af19fd3 (diff) | |
Merge branch 'disjointed-popovers' into 'develop'
Disjointed popovers
See merge request pleroma/pleroma-fe!1540
Diffstat (limited to 'src/components/basic_user_card/basic_user_card.vue')
| -rw-r--r-- | src/components/basic_user_card/basic_user_card.vue | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue index eeca7828..effd9268 100644 --- a/src/components/basic_user_card/basic_user_card.vue +++ b/src/components/basic_user_card/basic_user_card.vue @@ -1,24 +1,19 @@ <template> <div class="basic-user-card"> - <router-link :to="userProfileLink(user)"> - <UserAvatar - class="avatar" - :user="user" - @click.prevent="toggleUserExpanded" - /> + <router-link @click.prevent :to="userProfileLink(user)"> + <UserPopover + :userId="user.id" + :overlayCenters="true" + overlayCentersSelector=".avatar" + > + <UserAvatar + class="user-avatar avatar" + :user="user" + @click.prevent + /> + </UserPopover> </router-link> <div - v-if="userExpanded" - class="basic-user-card-expanded-content" - > - <UserCard - :user-id="user.id" - :rounded="true" - :bordered="true" - /> - </div> - <div - v-else class="basic-user-card-collapsed-content" > <div @@ -53,6 +48,8 @@ margin: 0; padding: 0.6em 1em; + --emoji-size: 14px; + &-collapsed-content { margin-left: 0.7em; text-align: left; |