Simplify imports

resources/assets/src/js/index.ts

@@ -1,9 +1,16 @@
+/* eslint-disable import/no-extraneous-dependencies */
 import './public-path' // Must be first
+import 'jquery'
+import 'bootstrap/js/dropdown'
+import 'bootstrap/js/modal'
+import 'bootstrap/js/transition'
+import 'admin-lte/build/js/Layout'
+import 'admin-lte/build/js/PushMenu'
+import 'admin-lte/build/js/Tree'
 import './i18n'
 import './net'
 import './event'
 import './element'
-import './layout'
 import './logout'
 import './check-updates'
 

resources/assets/src/js/layout.js

@@ -1,23 +0,0 @@
-/* eslint-disable import/no-extraneous-dependencies */
-import 'bootstrap/js/dropdown'
-import 'bootstrap/js/modal'
-import 'admin-lte/build/js/Layout'
-import 'admin-lte/build/js/PushMenu'
-import 'admin-lte/build/js/Tree'
-
-(() => {
-  const list = [
-    {
-      path: 'admin',
-      styl: () => import('../stylus/admin.styl'),
-    },
-    {
-      path: 'auth',
-      styl: () => import('../stylus/auth.styl'),
-    },
-  ]
-  const style = list.find(({ path }) => blessing.route.startsWith(path))
-  if (style) {
-    style.styl()
-  }
-})()

resources/assets/src/stylus/admin.styl

@@ -1,29 +1,3 @@
-.btn-group
-  .btn
-    margin-right 10px
-
-td
-  a
-    color inherit
-
-    img
-      margin-left 10px
-
-    cursor pointer
-
-  a:first-child > img
-    margin-left 0
-
-  a:last-child > img
-    margin-left 0
-
-.description
-  margin 7px 0 0 0
-  color #555
-
-  a
-    color #3c8dbc
-
 .btn-edit
   font-size 12px
   color #367fa9

resources/assets/src/stylus/auth.styl

@@ -8,5 +8,5 @@
 .captcha
   cursor pointer
 
-.el-button
+.auth-btn.el-button
   width 100%

resources/assets/src/stylus/common.styl

@@ -1,3 +1,6 @@
+@import './auth'
+@import './admin'
+
 font_stack = Ubuntu, 'Segoe UI', 'Microsoft Yahei', 'Microsoft Jhenghei', sans-serif
 
 @font-face

resources/assets/src/views/auth/Forgot.vue

@@ -22,7 +22,12 @@
         <a v-t="'auth.forgot.login-link'" :href="`${baseUrl}/auth/login`" class="text-center" />
       </div>
       <div class="col-xs-5">
-        <el-button type="primary" native-type="submit" :disabled="pending">
+        <el-button
+          type="primary"
+          native-type="submit"
+          :disabled="pending"
+          class="auth-btn"
+        >
           <template v-if="pending">
             <i class="fa fa-spinner fa-spin" /> {{ $t('auth.sending') }}
           </template>

resources/assets/src/views/auth/Login.vue

@@ -37,7 +37,12 @@
 
     <div class="row">
       <div class="col-xs-12">
-        <el-button type="primary" native-type="submit" :disabled="pending">
+        <el-button
+          type="primary"
+          native-type="submit"
+          :disabled="pending"
+          class="auth-btn"
+        >
           <template v-if="pending">
             <i class="fa fa-spinner fa-spin" /> {{ $t('auth.loggingIn') }}
           </template>

resources/assets/src/views/auth/Register.vue

@@ -74,7 +74,12 @@
         <a v-t="'auth.login-link'" :href="`${baseUrl}/auth/login`" class="text-center" />
       </div>
       <div class="col-xs-5">
-        <el-button type="primary" native-type="submit" :disabled="pending">
+        <el-button
+          type="primary"
+          native-type="submit"
+          :disabled="pending"
+          class="auth-btn"
+        >
           <template v-if="pending">
             <i class="fa fa-spinner fa-spin" /> {{ $t('auth.registering') }}
           </template>

resources/assets/src/views/auth/Reset.vue

@@ -27,7 +27,12 @@
     <div class="row">
       <div class="col-xs-7" />
       <div class="col-xs-5">
-        <el-button type="primary" native-type="submit" :disabled="pending">
+        <el-button
+          type="primary"
+          native-type="submit"
+          :disabled="pending"
+          class="auth-btn"
+        >
           <template v-if="pending">
             <i class="fa fa-spinner fa-spin" /> {{ $t('auth.resetting') }}
           </template>