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

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
This commit is contained in:
eal 2017-11-27 09:44:11 +00:00
parent f50aed3a63 bcd10b3475
commit da9cfdd06c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,6 +59,10 @@
color: $blue; color: $blue;
} }
.icon-star.lit {
color: orange;
}
.status-content { .status-content {
margin: 0; margin: 0;
max-height: 300px; max-height: 300px;

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

@ -17,7 +17,7 @@
<div v-if="notification.type === 'favorite'"> <div v-if="notification.type === 'favorite'">
<h1> <h1>
<span :title="'@'+notification.action.user.screen_name">{{ notification.action.user.name }}</span> <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> <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> </h1>
<div class="notification-gradient" :style="hiderStyle"></div> <div class="notification-gradient" :style="hiderStyle"></div>