logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: 42d36fc98b75882915f9863998038ac62a0ed832
parent: 3ed1eb572353fd7fa250148fbcfcd53cbed008ca
Author: Shpuld Shpludson <shp@cock.li>
Date:   Sun,  3 Mar 2019 20:16:51 +0000

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

Issue 418 notification timeago

Closes #418

See merge request pleroma/pleroma-fe!636

Diffstat:

Msrc/components/notification/notification.vue6+++++-
Msrc/components/notifications/notifications.scss2+-
2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue @@ -25,7 +25,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)"> diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss @@ -126,7 +126,7 @@ } .timeago { - font-size: 12px; + margin-right: .2em; } .icon-retweet.lit {