diff options
| author | Henry Jameson <me@hjkos.com> | 2018-08-16 13:41:45 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2018-08-16 13:41:45 +0300 |
| commit | 693eb4b717e8e1e0ecd4c7c5e4e0fa9cbdd8541a (patch) | |
| tree | 5d397ba5027f9c532d3cca50d00b76764024d934 | |
| parent | e8f7491003de352bb265b0046c6e1a06a4dff21e (diff) | |
cleanup, updated broken favorites look + localization strings
| -rw-r--r-- | src/components/notification/notification.vue | 10 | ||||
| -rw-r--r-- | src/components/notifications/notifications.scss | 10 | ||||
| -rw-r--r-- | src/i18n/messages.js | 6 | ||||
| -rw-r--r-- | src/modules/api.js | 1 |
4 files changed, 20 insertions, 7 deletions
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index 5d50e72a..2485b9ff 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -29,10 +29,12 @@ <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> </div> - <status v-if="notification.status" v-else class="faint" :compact="true" :statusoid="notification.status" :noHeading="true"></status> - <div v-if="!notification.status"> - Favorite for missing post - </div> + <template v-else> + <status 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> + </template> </div> </div> </template> diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss index 008530b4..09741060 100644 --- a/src/components/notifications/notifications.scss +++ b/src/components/notifications/notifications.scss @@ -58,6 +58,16 @@ border-bottom-color: inherit; 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 { width: 32px; height: 32px; diff --git a/src/i18n/messages.js b/src/i18n/messages.js index e9d6e176..cd605c05 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -339,7 +339,8 @@ const en = { read: 'Read!', followed_you: 'followed you', favorited_you: 'favorited your status', - repeated_you: 'repeated your status' + repeated_you: 'repeated your status', + broken_favorite: 'Unknown status, searching for it...' }, login: { login: 'Log in', @@ -1628,7 +1629,8 @@ const ru = { read: 'Прочесть', followed_you: 'начал(а) читать вас', favorited_you: 'нравится ваш статус', - repeated_you: 'повторил(а) ваш статус' + repeated_you: 'повторил(а) ваш статус', + broken_favorite: 'Неизвестный статус, ищем...' }, login: { login: 'Войти', diff --git a/src/modules/api.js b/src/modules/api.js index 20586f5c..2f07a91e 100644 --- a/src/modules/api.js +++ b/src/modules/api.js @@ -47,7 +47,6 @@ const api = { } }, fetchOldPost (store, { postId }) { - console.log(store) store.state.backendInteractor.fetchOldPost({ store, postId }) }, stopFetching (store, timeline) { |
