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

#436 - merge develop & resolve conflict

Browse source
This commit is contained in:
dave 2019-04-01 12:13:11 -04:00
commit 0af2f8e4fd
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/notification/notification.vue
View file

@ -1,11 +1,11 @@
<template>
<status
<status
v-if="notification.type === 'mention'"
:compact="true"
:statusoid="notification.status"
>
</status>
<div class="non-mention" :class="[userClass, { highlighted: userStyle }]" :style="[ userStyle ]"v-else>
<div class="non-mention" :class="[userClass, { highlighted: userStyle }]" :style="[ userStyle ]" v-else>
<a class='avatar-container' :href="notification.from_profile.statusnet_profile_url" @click.stop.prevent.capture="toggleUserExpanded">
<UserAvatar :compact="true" :betterShadow="betterShadow" :src="notification.from_profile.profile_image_url_original" />
</a>