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

2018-07-15 16:50:11 -07:00 · 2018-07-15 16:50:11 -07:00 · f2d2725ca0
commit f2d2725ca0
parent 05478e3277 b859ed61f4
130 changed files with 2275 additions and 1363 deletions
--- a/resources/themes/pterodactyl/templates/base/core.blade.php
+++ b/resources/themes/pterodactyl/templates/base/core.blade.php
@ -56,7 +56,7 @@
@section('below-container')
    <div class="flex-grow"></div>
    <div class="w-full m-auto mt-0 container">
-        <p class="text-right text-grey-dark text-xs">
+        <p class="text-center sm:text-right text-grey-dark text-xs">
            {!! trans('strings.copyright', ['year' => date('Y')]) !!}
        </p>
    </div>