Merge branch 'feature/vuejs' into feature/vue-serverview

This commit is contained in:
Dane Everitt 2018-06-02 23:28:55 -07:00
commit e65854c8c2
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
35 changed files with 827 additions and 192 deletions

View file

@ -24,14 +24,14 @@
@include('layouts.scripts')
</head>
<body class="{{ $css['body'] ?? 'bg-white' }}">
<div id="pterodactyl" class="flex flex-col min-h-screen">
<body class="{{ $css['body'] ?? 'bg-grey-lighter' }}">
@section('content')
@yield('above-container')
<div class="container">
<div id="pterodactyl" class="flex flex-col min-h-screen">
@yield('container')
</div>
@yield('below-container')
</div>
@show
@section('scripts')
{!! $asset->js('assets/scripts/bundle.js') !!}
@show