diff options
| author | dave <starpumadev@gmail.com> | 2019-04-01 12:13:11 -0400 |
|---|---|---|
| committer | dave <starpumadev@gmail.com> | 2019-04-01 12:13:11 -0400 |
| commit | 0af2f8e4fd399100a0034137ab26c6742db43639 (patch) | |
| tree | 1e425c67e3168a9bc357aa4f9b66911938e119d4 /src/components/notification/notification.vue | |
| parent | 21ea5adc8b4f8eb16026cdefd60a60c8952ae162 (diff) | |
| parent | 6c24ae9b0be25becc453cd62ba78b955c5fb6c70 (diff) | |
#436 - merge develop & resolve conflict
Diffstat (limited to 'src/components/notification/notification.vue')
| -rw-r--r-- | src/components/notification/notification.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index e5876cfa..bf952479 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -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> |