From 23d434c40c9b1ef218be53991f003d8767b50e7a Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 17 Dec 2018 19:17:03 +0300
Subject: [PATCH] collateral fixes for user-card: use still-image, styles for
 custom emoji

---
 src/components/user_card/user_card.js  |  4 +++-
 src/components/user_card/user_card.vue | 10 +++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index b8eb28e3dd..e674627a4b 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -1,4 +1,5 @@
 import UserCardContent from '../user_card_content/user_card_content.vue'
+import StillImage from '../still-image/still-image.vue'
 
 const UserCard = {
   props: [
@@ -12,7 +13,8 @@ const UserCard = {
     }
   },
   components: {
-    UserCardContent
+    UserCardContent,
+    StillImage
   },
   computed: {
     currentUser () { return this.$store.state.users.currentUser }
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index eb0d7576c8..a16960cdb3 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="card">
     <a href="#">
-      <img @click.prevent="toggleUserExpanded" class="avatar" :src="user.profile_image_url">
+      <StillImage @click.prevent="toggleUserExpanded" class="avatar" :src="user.profile_image_url"/>
     </a>
     <div class="usercard" v-if="userExpanded">
       <user-card-content :user="user" :switcher="false"></user-card-content>
@@ -40,6 +40,14 @@
   margin-top:0.0em;
   text-align: left;
   width: 100%;
+  .user-name {
+    img {
+      object-fit: contain;
+      height: 16px;
+      width: 16px;
+      vertical-align: middle;
+    }
+  }
 }
 
 .follows-you {