Merge branch 'develop' of https://gitgud.io/lambadalambda/pleroma-fe into wakarimasen/pleroma-fe-develop

This commit is contained in:
wakarimasen 2017-03-10 12:29:21 +01:00
commit 896de016ad
14 changed files with 60 additions and 63 deletions

View file

@ -36,7 +36,12 @@ const Status = {
return !!this.$store.state.users.currentUser
},
muted () { return !this.unmuted && this.status.user.muted },
isReply () { return !!this.status.in_reply_to_status_id }
isReply () { return !!this.status.in_reply_to_status_id },
borderColor () {
return {
borderBottomColor: this.$store.state.config.colors['base02']
}
}
},
components: {
Attachment,