diff options
| author | Henry Jameson <me@hjkos.com> | 2022-06-20 23:57:44 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2022-06-20 23:57:44 +0300 |
| commit | 01e56a3e10b9d77e2f5a7fa7c13ce3afbed468d4 (patch) | |
| tree | 3365827000d96abd1e1c8e869cafc99593d8bec1 /src/components/status/status.vue | |
| parent | cb89646c56288f42896d34e3b405621e08c88575 (diff) | |
| parent | 60571685c2e42e44b75157c3d52f162bf39c4bab (diff) | |
Merge remote-tracking branch 'origin/disjointed-popovers' into disjointed-popovers
* origin/disjointed-popovers:
popover controls for user-card
unify user popovers into a separate component
Diffstat (limited to 'src/components/status/status.vue')
| -rw-r--r-- | src/components/status/status.vue | 43 |
1 files changed, 11 insertions, 32 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 624960fe..771d336a 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -123,42 +123,21 @@ class="left-side" > <a :href="$router.resolve(userProfileLink).href" @click.prevent> - <Popover - trigger="click" - popover-class="popover-default user-popover" - :overlay-centers="true" - overlay-centers-selector=".user-info-avatar-link .Avatar" + <UserPopover + :userId="status.user.id" + :overlayCenters="true" > - <template v-slot:trigger> - <UserAvatar - class="post-avatar" - :bot="botIndicator" - :compact="compact" - :better-shadow="betterShadow" - :user="status.user" - /> - </template> - <template v-slot:content> - <UserCard - class="mention-link-popover" - :user-id="status.user.id" - :hide-bio="true" - :bordered="false" - :allow-zooming-avatar="true" - :rounded="true" - /> - </template> - </Popover> + <UserAvatar + class="post-avatar" + :bot="botIndicator" + :compact="compact" + :better-shadow="betterShadow" + :user="status.user" + /> + </UserPopover> </a> </div> <div class="right-side"> - <UserCard - v-if="userExpanded" - :user-id="status.user.id" - :rounded="true" - :bordered="true" - class="usercard" - /> <div v-if="!noHeading" class="status-heading" |