aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_card/user_card.vue
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2022-06-20 23:57:44 +0300
committerHenry Jameson <me@hjkos.com>2022-06-20 23:57:44 +0300
commit01e56a3e10b9d77e2f5a7fa7c13ce3afbed468d4 (patch)
tree3365827000d96abd1e1c8e869cafc99593d8bec1 /src/components/user_card/user_card.vue
parentcb89646c56288f42896d34e3b405621e08c88575 (diff)
parent60571685c2e42e44b75157c3d52f162bf39c4bab (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/user_card/user_card.vue')
-rw-r--r--src/components/user_card/user_card.vue37
1 files changed, 31 insertions, 6 deletions
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 67837845..936d6798 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -8,7 +8,7 @@
:style="style"
class="background-image"
/>
- <div class="panel-heading -flexible-height">
+ <div :class="onClose ? '' : panel-heading -flexible-height">
<div class="user-info">
<div class="container">
<a
@@ -38,12 +38,16 @@
</router-link>
<div class="user-summary">
<div class="top-line">
- <RichContent
- :title="user.name"
+ <router-link
+ :to="userProfileLink(user)"
class="user-name"
- :html="user.name"
- :emoji="user.emoji"
- />
+ >
+ <RichContent
+ :title="user.name"
+ :html="user.name"
+ :emoji="user.emoji"
+ />
+ </router-link>
<button
v-if="!isOtherUser && user.is_local"
class="button-unstyled edit-profile-button"
@@ -72,6 +76,27 @@
:user="user"
:relationship="relationship"
/>
+ <router-link
+ v-if="onClose"
+ :to="userProfileLink(user)"
+ class="button-unstyled external-link-button"
+ @click="onClose"
+ >
+ <FAIcon
+ class="icon"
+ icon="expand-alt"
+ />
+ </router-link>
+ <button
+ v-if="onClose"
+ class="button-unstyled external-link-button"
+ @click="onClose"
+ >
+ <FAIcon
+ class="icon"
+ icon="times"
+ />
+ </button>
</div>
<div class="bottom-line">
<router-link