diff --git a/resources/assets/src/js/index.ts b/resources/assets/src/js/index.ts index 4e1a0aed..7d29c0df 100644 --- a/resources/assets/src/js/index.ts +++ b/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' diff --git a/resources/assets/src/js/layout.js b/resources/assets/src/js/layout.js deleted file mode 100644 index 7fe20a73..00000000 --- a/resources/assets/src/js/layout.js +++ /dev/null @@ -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() - } -})() diff --git a/resources/assets/src/stylus/admin.styl b/resources/assets/src/stylus/admin.styl index 976bf18e..5214a493 100644 --- a/resources/assets/src/stylus/admin.styl +++ b/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 diff --git a/resources/assets/src/stylus/auth.styl b/resources/assets/src/stylus/auth.styl index 6c81e544..547a0f03 100644 --- a/resources/assets/src/stylus/auth.styl +++ b/resources/assets/src/stylus/auth.styl @@ -8,5 +8,5 @@ .captcha cursor pointer -.el-button +.auth-btn.el-button width 100% diff --git a/resources/assets/src/stylus/common.styl b/resources/assets/src/stylus/common.styl index 4bae0755..df8b4826 100644 --- a/resources/assets/src/stylus/common.styl +++ b/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 diff --git a/resources/assets/src/views/auth/Forgot.vue b/resources/assets/src/views/auth/Forgot.vue index d8042353..2388275b 100644 --- a/resources/assets/src/views/auth/Forgot.vue +++ b/resources/assets/src/views/auth/Forgot.vue @@ -22,7 +22,12 @@
- + diff --git a/resources/assets/src/views/auth/Login.vue b/resources/assets/src/views/auth/Login.vue index 00e10890..0eb76e6a 100644 --- a/resources/assets/src/views/auth/Login.vue +++ b/resources/assets/src/views/auth/Login.vue @@ -37,7 +37,12 @@
- + diff --git a/resources/assets/src/views/auth/Reset.vue b/resources/assets/src/views/auth/Reset.vue index 3b3568b4..4a4e71d6 100644 --- a/resources/assets/src/views/auth/Reset.vue +++ b/resources/assets/src/views/auth/Reset.vue @@ -27,7 +27,12 @@
- +