Merge branch 'more-fixes' into shigusegubu-themes3

src/api/helpers.js

@@ -17,7 +17,6 @@ export const paramsString = (params = {}) => {
     }
   })()
 
-
   const arrays = []
   const nonArrays = []
 

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(
+      component: AuthForm,
-        () => import('src/components/auth_form/auth_form.js'),
-      ),
     },
     {
       name: 'shout-panel',

src/components/global_error/global_error.js

@@ -1,12 +1,13 @@
 import { mapActions, mapState } from 'pinia'
-
+import { defineAsyncComponent } from 'vue'
-import ErrorModal from 'src/components/error_modal/error_modal.vue'
 
 import { useInterfaceStore } from 'src/stores/interface.js'
 
 const GlobalError = {
   components: {
-    ErrorModal,
+    ErrorModal: defineAsyncComponent(
+      () => import('src/components/error_modal/error_modal.vue'),
+    ),
   },
   computed: {
     title() {

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 {

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',
+      },
+    },
+  ],
 }

src/components/notifications/notifications.vue

@@ -51,7 +51,6 @@
           <NotificationFilters class="rightside-button" />
         </div>
         <div
-          class="panel-body"
           role="feed"
         >
           <div