Moving element-ui css to css file

AsgardCms · Sep 16, 2017 · 57933d4 · 57933d4
1 parent b196225
commit 57933d4
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 526 deletions.
diff --git a/Themes/Adminlte/views/layouts/master.blade.php b/Themes/Adminlte/views/layouts/master.blade.php
@@ -16,6 +16,7 @@
     @foreach($cssFiles as $css)
         <link media="all" type="text/css" rel="stylesheet" href="{{ URL::asset($css) }}">
     @endforeach
+    <link media="all" type="text/css" rel="stylesheet" href="{{ mix('css/app.css') }}">
     {!! Theme::script('vendor/jquery/jquery.min.js') !!}
     @include('partials.asgard-globals')
     @section('styles')

diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,3 +1,4 @@
 {
-    "/js/app.js": "/js/app.js"
+    "/js/app.js": "/js/app.js",
+    "/css/app.css": "/css/app.css"
 }
diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
@@ -5,7 +5,6 @@ import VueI18n from 'vue-i18n'
 import VueRouter from 'vue-router'
 import ElementUI from 'element-ui'
 import DataTables from 'vue-data-tables'
-import 'element-ui/lib/theme-default/index.css'
 import locale from 'element-ui/lib/locale/lang/en'
 
 Vue.use(ElementUI, { locale });

diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss
@@ -1,9 +1,2 @@
-
-// Fonts
-@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600");
-
-// Variables
-@import "variables";
-
-// Bootstrap
-@import "~bootstrap-sass/assets/stylesheets/bootstrap";
+// Element UI
+@import "~element-ui/lib/theme-default/index.css";
diff --git a/webpack.mix.js b/webpack.mix.js
@@ -11,4 +11,5 @@ let mix = require('laravel-mix');
  |
  */
 
-mix.js('resources/assets/js/app.js', 'public/js');
+mix.js('resources/assets/js/app.js', 'public/js')
+    .sass('resources/assets/sass/app.scss', 'public/css');