Merge branch 'feature/task1.0.0' into feature/task1.0.0-0505-ch

3 years ago · ce51644388
parent 4beb13e940 e43abc1a64
commit ce51644388
1 changed files with 4 additions and 4 deletions
--- a/nuxt.config.js
+++ b/nuxt.config.js
@ -53,6 +53,10 @@ export default {
  buildModules: [
  ],

+  styleResources:  {
+    scss: '@/assets/scss/global.scss'
+  },
+
  // Modules: https://go.nuxtjs.dev/config-modules
  modules: [
    '@nuxtjs/axios',
@ -60,10 +64,6 @@ export default {
    '@nuxtjs/style-resources'
  ],

-  styleResources:  {
-    scss: '@/assets/scss/global.scss'
-  },
-
  // Build Configuration: https://go.nuxtjs.dev/config-build
  build: {
    transpile: [/^element-ui/],