StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/service-changes

Browse source
This commit is contained in:
Dane Everitt 2016-12-14 16:53:53 -05:00
commit fc38b09e1f
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
169 changed files with 2268 additions and 2289 deletions
Download patch file Download diff file Expand all files Collapse all files

7
public/index.php
View file

@ -1,9 +1,8 @@
<?php
/**
* Laravel - A PHP Framework For Web Artisans
* Laravel - A PHP Framework For Web Artisans.
*
* @package Laravel
* @author Taylor Otwell <taylorotwell@gmail.com>
*/
@ -19,7 +18,7 @@
|
*/
require __DIR__.'/../bootstrap/autoload.php';
require __DIR__ . '/../bootstrap/autoload.php';
/*
|--------------------------------------------------------------------------
@ -33,7 +32,7 @@ require __DIR__.'/../bootstrap/autoload.php';
|
*/
$app = require_once __DIR__.'/../bootstrap/app.php';
$app = require_once __DIR__ . '/../bootstrap/app.php';
/*
|--------------------------------------------------------------------------

38
public/js/jquery.terminal-0.11.23.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

37
public/js/jquery.terminal-0.11.6.min.js vendored
View file

File diff suppressed because one or more lines are too long

18
public/themes/default/css/pterodactyl.css
View file

@ -286,6 +286,24 @@ li.btn.btn-default.pill:active,li.btn.btn-default.pill:focus,li.btn.btn-default.
opacity: 1;
}
#consoleNotify {
position: absolute;
bottom: 0;
margin-right: 17px;
margin-bottom: 2px;
z-index: 10;
background: white;
right: 0;
opacity: .6;
padding: 5px 7px;
border-radius: 5px;
cursor: pointer;
}
#consoleNotify:hover {
opacity: .9;
}
.hasFileHover {
border: 2px dashed #0087F7;
border-radius: 5px;