Fix merge conflicts

1 files changed, 16 insertions, 16 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..9cca7840 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -1,24 +1,22 @@
 <template>
   <div class="basic-user-card">
-    <router-link :to="userProfileLink(user)">
-      <UserAvatar
-        class="avatar"
-        :user="user"
-        @click.prevent="toggleUserExpanded"
-      />
-    </router-link>
-    <div
-      v-if="userExpanded"
-      class="basic-user-card-expanded-content"
+    <router-link
+      :to="userProfileLink(user)"
+      @click.prevent
     >
-      <UserCard
+      <UserPopover
         :user-id="user.id"
-        :rounded="true"
-        :bordered="true"
-      />
-    </div>
+        :overlay-centers="true"
+        overlay-centers-selector=".avatar"
+      >
+        <UserAvatar
+          class="user-avatar avatar"
+          :user="user"
+          @click.prevent
+        />
+      </UserPopover>
+    </router-link>
     <div
-      v-else
       class="basic-user-card-collapsed-content"
     >
       <div
@@ -53,6 +51,8 @@
   margin: 0;
   padding: 0.6em 1em;
 
+   --emoji-size: 14px;
+
   &-collapsed-content {
     margin-left: 0.7em;
     text-align: left;