Merge branch 'fix/minor-fixes-console-warnings-stretching' into 'develop'

Misc fixes: Fix uploads stretching on chrome, fix warnings in console

See merge request pleroma/pleroma-fe!842
This commit is contained in:
HJ 2019-06-18 16:31:20 +00:00
commit 195057040c
3 changed files with 8 additions and 1 deletions

View file

@ -68,6 +68,7 @@
max-height: 200px; max-height: 200px;
max-width: 100%; max-width: 100%;
display: flex; display: flex;
align-items: center;
video { video {
max-width: 100%; max-width: 100%;
} }

View file

@ -1,6 +1,11 @@
<template> <template>
<div class="avatars"> <div class="avatars">
<router-link :to="userProfileLink(user)" class="avatars-item" v-for="user in slicedUsers"> <router-link
:to="userProfileLink(user)"
class="avatars-item"
v-for="user in slicedUsers"
:key="user.id"
>
<UserAvatar :user="user" class="avatar-small" /> <UserAvatar :user="user" class="avatar-small" />
</router-link> </router-link>
</div> </div>

View file

@ -139,6 +139,7 @@ const conversation = {
return (this.isExpanded) && id === this.status.id return (this.isExpanded) && id === this.status.id
}, },
setHighlight (id) { setHighlight (id) {
if (!id) return
this.highlight = id this.highlight = id
this.$store.dispatch('fetchFavsAndRepeats', id) this.$store.dispatch('fetchFavsAndRepeats', id)
}, },