diff --git a/src/App.scss b/src/App.scss index b9aded419..61ab44e64 100644 --- a/src/App.scss +++ b/src/App.scss @@ -376,6 +376,7 @@ nav { position: relative; border-bottom: 1px solid; border-color: var(--border); + width: 100%; &:first-child { border-top-right-radius: var(--roundness); @@ -620,22 +621,38 @@ option { overflow: hidden; text-overflow: ellipsis; + &.-dot, + &.-counter { + margin: 0; + position: absolute; + } + &.-dot { - border-radius: 100%; min-height: 8px; max-height: 8px; min-width: 8px; max-width: 8px; padding: 0; line-height: 0; - margin: 0; font-size: 0; - position: absolute; left: calc(50% - 4px); top: calc(50% - 4px); margin-left: 6px; margin-top: -6px; } + + &.-counter { + border-radius: var(--roundness); + font-size: 0.75em; + line-height: 1; + text-align: right; + padding: 0.2em; + min-width: 0; + left: calc(50% - 0.5em); + top: calc(50% - 0.4em); + margin-left: 0.7em; + margin-top: -1em; + } } .alert { diff --git a/src/boot/after_store.js b/src/boot/after_store.js index 7039f85a6..5b9bb4563 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -328,17 +328,14 @@ const setConfig = async ({ store }) => { } const checkOAuthToken = async ({ store }) => { - // eslint-disable-next-line no-async-promise-executor - return new Promise(async (resolve, reject) => { - if (store.getters.getUserToken()) { - try { - await store.dispatch('loginUser', store.getters.getUserToken()) - } catch (e) { - console.error(e) - } + if (store.getters.getUserToken()) { + try { + await store.dispatch('loginUser', store.getters.getUserToken()) + } catch (e) { + console.error(e) } - resolve() - }) + } + return Promise.resolve() } const afterStoreSetup = async ({ store, i18n }) => { diff --git a/src/components/notification/notification.scss b/src/components/notification/notification.scss index 86d3e31df..ad05a2f38 100644 --- a/src/components/notification/notification.scss +++ b/src/components/notification/notification.scss @@ -1,5 +1,3 @@ -@import "../../variables"; - // TODO Copypaste from Status, should unify it somehow .Notification { border-bottom: 1px solid; @@ -70,28 +68,22 @@ } &.-type--repeat .type-icon { - color: $fallback--cGreen; - color: var(--cGreen, $fallback--cGreen); + color: var(--cGreen); } &.-type--follow .type-icon { - color: $fallback--cBlue; - color: var(--cBlue, $fallback--cBlue); + color: var(--cBlue); } &.-type--follow-request .type-icon { - color: $fallback--cBlue; - color: var(--cBlue, $fallback--cBlue); + color: var(--cBlue); } &.-type--like .type-icon { - color: orange; - color: $fallback--cOrange; - color: var(--cOrange, $fallback--cOrange); + color: var(--cOrange); } &.-type--move .type-icon { - color: $fallback--cBlue; - color: var(--cBlue, $fallback--cBlue); + color: var(--cBlue); } } diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index 5c425200b..632ae6e9f 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -247,7 +247,6 @@ />