moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

collateral fixes for user-card: use still-image, styles for custom emoji

This commit is contained in:
Henry Jameson 2018-12-17 19:17:03 +03:00
parent 8f255fbad4
commit 23d434c40c
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/user_card/user_card.js
View File

@ -1,4 +1,5 @@
import UserCardContent from '../user_card_content/user_card_content.vue' import UserCardContent from '../user_card_content/user_card_content.vue'
import StillImage from '../still-image/still-image.vue'
const UserCard = { const UserCard = {
props: [ props: [
@ -12,7 +13,8 @@ const UserCard = {
} }
}, },
components: { components: {
UserCardContent UserCardContent,
StillImage
}, },
computed: { computed: {
currentUser () { return this.$store.state.users.currentUser } currentUser () { return this.$store.state.users.currentUser }

10
src/components/user_card/user_card.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="card"> <div class="card">
<a href="#"> <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> </a>
<div class="usercard" v-if="userExpanded"> <div class="usercard" v-if="userExpanded">
<user-card-content :user="user" :switcher="false"></user-card-content> <user-card-content :user="user" :switcher="false"></user-card-content>
@ -40,6 +40,14 @@
margin-top:0.0em; margin-top:0.0em;
text-align: left; text-align: left;
width: 100%; width: 100%;
.user-name {
img {
object-fit: contain;
height: 16px;
width: 16px;
vertical-align: middle;
}
}
} }
.follows-you { .follows-you {