therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'remove_favorite_hacks' into 'develop'

Browse source 
no more "broken favorite"

Closes #218 and #145

See merge request pleroma/pleroma-fe!431
This commit is contained in:
HJ 2018-12-19 14:57:25 +00:00
commit b65ac128c1
7 changed files with 3 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/notification/notification.vue
View file

@ -33,10 +33,7 @@
</router-link>
</div>
<template v-else>
<status :activatePanel="activatePanel" v-if="notification.status" class="faint" :compact="true" :statusoid="notification.status" :noHeading="true"></status>
<div class="broken-favorite" v-else>
{{$t('notifications.broken_favorite')}}
</div>
<status :activatePanel="activatePanel" class="faint" :compact="true" :statusoid="notification.status" :noHeading="true"></status>
</template>
</div>
</div>

10
src/components/notifications/notifications.scss
View file

@ -36,16 +36,6 @@
border-color: $fallback--border;
border-color: var(--border, $fallback--border);
.broken-favorite {
border-radius: $fallback--tooltipRadius;
border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
color: $fallback--text;
color: var(--alertErrorText, $fallback--text);
background-color: $fallback--alertError;
background-color: var(--alertError, $fallback--alertError);
padding: 2px .5em
}
.avatar-compact {
width: 32px;
height: 32px;