diff --git a/src/api/helpers.js b/src/api/helpers.js index ce41eca77..4bf16e0cc 100644 --- a/src/api/helpers.js +++ b/src/api/helpers.js @@ -17,7 +17,6 @@ export const paramsString = (params = {}) => { } })() - const arrays = [] const nonArrays = [] diff --git a/src/boot/routes.js b/src/boot/routes.js index 9b00a8004..d50baab04 100644 --- a/src/boot/routes.js +++ b/src/boot/routes.js @@ -1,5 +1,6 @@ import { defineAsyncComponent } from 'vue' +import AuthForm from 'src/components/auth_form/auth_form.js' import BookmarkTimeline from 'src/components/bookmark_timeline/bookmark_timeline.vue' import BubbleTimeline from 'src/components/bubble_timeline/bubble_timeline.vue' import ConversationPage from 'src/components/conversation-page/conversation-page.vue' @@ -147,9 +148,7 @@ export default (store) => { { name: 'login', path: '/login', - component: defineAsyncComponent( - () => import('src/components/auth_form/auth_form.js'), - ), + component: AuthForm, }, { name: 'shout-panel', diff --git a/src/components/global_error/global_error.js b/src/components/global_error/global_error.js index cd4593521..b4768b8ad 100644 --- a/src/components/global_error/global_error.js +++ b/src/components/global_error/global_error.js @@ -1,12 +1,13 @@ import { mapActions, mapState } from 'pinia' - -import ErrorModal from 'src/components/error_modal/error_modal.vue' +import { defineAsyncComponent } from 'vue' import { useInterfaceStore } from 'src/stores/interface.js' const GlobalError = { components: { - ErrorModal, + ErrorModal: defineAsyncComponent( + () => import('src/components/error_modal/error_modal.vue'), + ), }, computed: { title() { diff --git a/src/components/notification/notification.scss b/src/components/notification/notification.scss index 934d3e58d..3e2fa54a5 100644 --- a/src/components/notification/notification.scss +++ b/src/components/notification/notification.scss @@ -10,11 +10,6 @@ cursor: pointer; } - &.Status { - /* stylelint-disable-next-line declaration-no-important */ - background-color: transparent !important; - } - --emoji-size: 1em; &:hover { diff --git a/src/components/notification/notification.style.js b/src/components/notification/notification.style.js index 49e28cf2e..db5fc5b94 100644 --- a/src/components/notification/notification.style.js +++ b/src/components/notification/notification.style.js @@ -1,6 +1,6 @@ export default { name: 'Notification', - selector: '.Notification', + selector: '.NotificationParent', validInnerComponents: [ 'Text', 'Link', @@ -9,5 +9,11 @@ export default { 'Avatar', 'PollGraph', ], - defaultRules: [], + defaultRules: [ + { + directives: { + background: '--bg', + }, + }, + ], } diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue index 387c3a847..66819317b 100644 --- a/src/components/notifications/notifications.vue +++ b/src/components/notifications/notifications.vue @@ -51,7 +51,6 @@