Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cleanup, updated broken favorites look + localization strings

Browse source
This commit is contained in:
Henry Jameson 2018-08-16 13:41:45 +03:00
parent e8f7491003
commit 693eb4b717
4 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,10 +29,12 @@
<div class="follow-text" v-if="notification.type === 'follow'"> <div class="follow-text" v-if="notification.type === 'follow'">
<router-link :to="{ name: 'user-profile', params: { id: notification.action.user.id } }">@{{notification.action.user.screen_name}}</router-link> <router-link :to="{ name: 'user-profile', params: { id: notification.action.user.id } }">@{{notification.action.user.screen_name}}</router-link>
</div> </div>
<status v-if="notification.status" v-else class="faint" :compact="true" :statusoid="notification.status" :noHeading="true"></status> <template v-else>
<div v-if="!notification.status"> <status v-if="notification.status" class="faint" :compact="true" :statusoid="notification.status" :noHeading="true"></status>
Favorite for missing post <div class="broken-favorite" v-else>
</div> {{$t('notifications.broken_favorite')}}
</div>
</template>
</div> </div>
</div> </div>
</template> </template>

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

@ -58,6 +58,16 @@
border-bottom-color: inherit; border-bottom-color: inherit;
padding-left: 4px; padding-left: 4px;
.broken-favorite {
border-radius: $fallback--tooltipRadius;
border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
color: $fallback--faint;
color: var(--faint, $fallback--faint);
background-color: $fallback--cAlertRed;
background-color: var(--cAlertRed, $fallback--cAlertRed);
padding: 2px .5em
}
.avatar-compact { .avatar-compact {
width: 32px; width: 32px;
height: 32px; height: 32px;

6
src/i18n/messages.js
View file

@ -339,7 +339,8 @@ const en = {
read: 'Read!', read: 'Read!',
followed_you: 'followed you', followed_you: 'followed you',
favorited_you: 'favorited your status', favorited_you: 'favorited your status',
repeated_you: 'repeated your status' repeated_you: 'repeated your status',
broken_favorite: 'Unknown status, searching for it...'
}, },
login: { login: {
login: 'Log in', login: 'Log in',
@ -1628,7 +1629,8 @@ const ru = {
read: 'Прочесть', read: 'Прочесть',
followed_you: 'начал(а) читать вас', followed_you: 'начал(а) читать вас',
favorited_you: 'нравится ваш статус', favorited_you: 'нравится ваш статус',
repeated_you: 'повторил(а) ваш статус' repeated_you: 'повторил(а) ваш статус',
broken_favorite: 'Неизвестный статус, ищем...'
}, },
login: { login: {
login: 'Войти', login: 'Войти',

1
src/modules/api.js
View file

@ -47,7 +47,6 @@ const api = {
} }
}, },
fetchOldPost (store, { postId }) { fetchOldPost (store, { postId }) {
console.log(store)
store.state.backendInteractor.fetchOldPost({ store, postId }) store.state.backendInteractor.fetchOldPost({ store, postId })
}, },
stopFetching (store, timeline) { stopFetching (store, timeline) {