moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'issue-418-notification-timeago' into 'develop' 

Issue 418 notification timeago

Closes #418

See merge request pleroma/pleroma-fe!636
This commit is contained in:
Shpuld Shpludson 2019-03-03 20:16:51 +00:00
parent 3ed1eb5723 0ea9e4ca14
commit 42d36fc98b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/notification/notification.vue
View File

@ -25,7 +25,11 @@
<small>{{$t('notifications.followed_you')}}</small> <small>{{$t('notifications.followed_you')}}</small>
</span> </span>
</div> </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> </span>
<div class="follow-text" v-if="notification.type === 'follow'"> <div class="follow-text" v-if="notification.type === 'follow'">
<router-link :to="userProfileLink(notification.action.user)"> <router-link :to="userProfileLink(notification.action.user)">

2
src/components/notifications/notifications.scss
View File

@ -126,7 +126,7 @@
} }
.timeago { .timeago {
font-size: 12px; margin-right: .2em;
} }
.icon-retweet.lit { .icon-retweet.lit {