Commit 42d36fc9 authored by Shpuld Shpludson's avatar Shpuld Shpludson

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

Issue 418 notification timeago

Closes #418

See merge request pleroma/pleroma-fe!636
parents 3ed1eb57 0ea9e4ca
...@@ -25,7 +25,11 @@ ...@@ -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)">
......
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
} }
.timeago { .timeago {
font-size: 12px; margin-right: .2em;
} }
.icon-retweet.lit { .icon-retweet.lit {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment