Merge branch 'feature/vuejs' into feature/vue-serverview
This commit is contained in:
commit
05478e3277
29 changed files with 2997 additions and 16217 deletions
|
@ -19,7 +19,7 @@
|
|||
@show
|
||||
|
||||
@section('assets')
|
||||
{!! $asset->css('assets/css/bundle.css') !!}
|
||||
{!! $asset->css('main.css') !!}
|
||||
@show
|
||||
|
||||
@include('layouts.scripts')
|
||||
|
@ -33,7 +33,7 @@
|
|||
@yield('below-container')
|
||||
@show
|
||||
@section('scripts')
|
||||
{!! $asset->js('assets/scripts/app.js') !!}
|
||||
{!! $asset->js('main.js') !!}
|
||||
@show
|
||||
</body>
|
||||
</html>
|
||||
|
|
Reference in a new issue