Merge branch 'develop' into dane/fix-performance-snafu

This commit is contained in:
Dane Everitt 2020-08-25 22:02:45 -07:00
commit 6bc51adad7
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
5 changed files with 24 additions and 100 deletions

View file

@ -35,21 +35,11 @@
@import url('//fonts.googleapis.com/css?family=IBM+Plex+Mono|IBM+Plex+Sans:500&display=swap');
</style>
@section('assets')
{{-- {!! $asset->css('main.css') !!}--}}
@show
@yield('assets')
@include('layouts.scripts')
</head>
<body class="{{ $css['body'] ?? 'bg-neutral-50' }}">
@if(\Illuminate\Support\Str::contains(config('app.version'), ['-alpha', '-beta']))
<div class="bg-red-500">
<p class="text-center text-white text-sm p-3">
You are running a pre-release version of Pterodactyl. Please report any issues
<a href="https://github.com/pterodactyl/panel/issues" class="text-red-100">via GitHub</a>.
</p>
</div>
@endif
@section('content')
@yield('above-container')
@yield('container')