diff options
| author | shpuld <shp@cock.li> | 2019-03-12 23:50:54 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2019-03-12 23:50:54 +0200 |
| commit | 7ce8fe92141cde52e3f47d555bd6c604e1a673ed (patch) | |
| tree | 226eff9fcc01b2b2675c37075a7ab9056466060c /src/components/notification/notification.vue | |
| parent | c7e180080afd0e255e439030df800f79d33ff5de (diff) | |
| parent | f397537642a6b8a4079d8d45d835ddd50f2d2b4a (diff) | |
merge develop, add mobile nav component
Diffstat (limited to 'src/components/notification/notification.vue')
| -rw-r--r-- | src/components/notification/notification.vue | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index a0a55cba..5e9cef97 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -5,9 +5,7 @@ <UserAvatar :compact="true" :betterShadow="betterShadow" :src="notification.action.user.profile_image_url_original"/> </a> <div class='notification-right'> - <div class="usercard notification-usercard" v-if="userExpanded"> - <user-card-content :user="notification.action.user" :switcher="false"></user-card-content> - </div> + <UserCard :user="notification.action.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> @@ -25,7 +23,11 @@ <small>{{$t('notifications.followed_you')}}</small> </span> </div> - <small class="timeago"><router-link v-if="notification.status" :to="{ name: 'conversation', params: { id: notification.status.id } }"><timeago :since="notification.action.created_at" :auto-update="240"></timeago></router-link></small> + <div class="timeago"> + <router-link v-if="notification.status" :to="{ name: 'conversation', params: { id: notification.status.id } }" class="faint-link"> + <timeago :since="notification.action.created_at" :auto-update="240"></timeago> + </router-link> + </div> </span> <div class="follow-text" v-if="notification.type === 'follow'"> <router-link :to="userProfileLink(notification.action.user)"> |