logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: da9cfdd06c9fc0a5359fa362d620e53fe286216e
parent: f50aed3a63c69ffa2f77aafb06a9d9e008e97cf3
Author: eal <eal@waifu.club>
Date:   Mon, 27 Nov 2017 09:44:11 +0000

Merge branch 'fix/notifications-star-not-colored' into 'develop'

Make star icon in notifications behave like the other icons..

See merge request pleroma/pleroma-fe!178

Diffstat:

Msrc/components/notifications/notifications.scss4++++
Msrc/components/notifications/notifications.vue2+-
2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss @@ -59,6 +59,10 @@ color: $blue; } + .icon-star.lit { + color: orange; + } + .status-content { margin: 0; max-height: 300px; diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue @@ -17,7 +17,7 @@ <div v-if="notification.type === 'favorite'"> <h1> <span :title="'@'+notification.action.user.screen_name">{{ notification.action.user.name }}</span> - <i class="fa icon-star"></i> + <i class="fa icon-star lit"></i> <small><router-link :to="{ name: 'conversation', params: { id: notification.status.id } }"><timeago :since="notification.action.created_at" :auto-update="240"></timeago></router-link></small> </h1> <div class="notification-gradient" :style="hiderStyle"></div>