Moving element-ui css to css file

parent b1962256
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
@foreach($cssFiles as $css) @foreach($cssFiles as $css)
<link media="all" type="text/css" rel="stylesheet" href="{{ URL::asset($css) }}"> <link media="all" type="text/css" rel="stylesheet" href="{{ URL::asset($css) }}">
@endforeach @endforeach
<link media="all" type="text/css" rel="stylesheet" href="{{ mix('css/app.css') }}">
{!! Theme::script('vendor/jquery/jquery.min.js') !!} {!! Theme::script('vendor/jquery/jquery.min.js') !!}
@include('partials.asgard-globals') @include('partials.asgard-globals')
@section('styles') @section('styles')
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
{ {
"/js/app.js": "/js/app.js" "/js/app.js": "/js/app.js",
"/css/app.css": "/css/app.css"
} }
\ No newline at end of file
...@@ -5,7 +5,6 @@ import VueI18n from 'vue-i18n' ...@@ -5,7 +5,6 @@ import VueI18n from 'vue-i18n'
import VueRouter from 'vue-router' import VueRouter from 'vue-router'
import ElementUI from 'element-ui' import ElementUI from 'element-ui'
import DataTables from 'vue-data-tables' import DataTables from 'vue-data-tables'
import 'element-ui/lib/theme-default/index.css'
import locale from 'element-ui/lib/locale/lang/en' import locale from 'element-ui/lib/locale/lang/en'
Vue.use(ElementUI, { locale }); Vue.use(ElementUI, { locale });
......
// Element UI
// Fonts @import "~element-ui/lib/theme-default/index.css";
@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600");
// Variables
@import "variables";
// Bootstrap
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
...@@ -11,4 +11,5 @@ let mix = require('laravel-mix'); ...@@ -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');
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment