diff options
| author | shpuld <shp@cock.li> | 2019-04-01 22:42:06 +0300 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2019-04-01 22:42:06 +0300 |
| commit | 46de457f50416d0c8f37a833356b0b7ea643a53f (patch) | |
| tree | 2af3e96da21aee1e06f0eb6beff82c24770b7296 /src/components/notification/notification.vue | |
| parent | 2879495b8ab16a07d337965871e951f660fc1815 (diff) | |
| parent | df366a586d6549b41d5537c57eb51c5f0f54a641 (diff) | |
Merge branch 'develop' into feature/mobile-improvements-3
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 5e9cef97..8f532747 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -1,11 +1,11 @@ <template> <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.action.user.statusnet_profile_url" @click.stop.prevent.capture="toggleUserExpanded"> <UserAvatar :compact="true" :betterShadow="betterShadow" :src="notification.action.user.profile_image_url_original"/> </a> <div class='notification-right'> - <UserCard :user="notification.action.user" :rounded="true" :bordered="true" v-if="userExpanded"/> + <UserCard :user="user" :rounded="true" :bordered="true" v-if="userExpanded"/> <span class="notification-details"> <div class="name-and-action"> <span class="username" v-if="!!notification.action.user.name_html" :title="'@'+notification.action.user.screen_name" v-html="notification.action.user.name_html"></span> |