therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge develop and fix conflicts AGAIN

Browse source
This commit is contained in:
shpuld 2019-02-04 19:49:23 +02:00
commit 54e7e0e31b
26 changed files with 145 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
import UserCardContent from '../user_card_content/user_card_content.vue'
import StillImage from '../still-image/still-image.vue'
import UserAvatar from '../user_avatar/user_avatar.vue'
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
const UserCard = {
@ -15,7 +15,7 @@ const UserCard = {
},
components: {
UserCardContent,
StillImage
UserAvatar
},
computed: {
currentUser () { return this.$store.state.users.currentUser }

8
src/components/user_card/user_card.vue
View file

@ -1,7 +1,7 @@
<template>
<div class="card">
<a href="#">
<StillImage @click.prevent.native="toggleUserExpanded" class="avatar" :src="user.profile_image_url"/>
<UserAvatar class="avatar" :compact="true" @click.prevent.native="toggleUserExpanded" :src="user.profile_image_url"/>
</a>
<div class="usercard" v-if="userExpanded">
<user-card-content :user="user" :switcher="false"></user-card-content>
@ -69,11 +69,7 @@
border-bottom-color: var(--border, $fallback--border);
.avatar {
margin-top: 0.2em;
width:32px;
height: 32px;
border-radius: $fallback--avatarAltRadius;
border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
padding: 0;
}
}