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

Merge branch 'develop' into feature/node-maintenance

Browse source
This commit is contained in:
Dane Everitt 2018-05-31 22:49:07 -07:00 • committed by GitHub
commit 8aadc62882
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 190 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/themes/pterodactyl/layouts/master.blade.php
View file

@ -44,7 +44,7 @@
<header class="main-header">
<a href="{{ route('index') }}" class="logo">
<span class="logo-lg">{{ config('app.name', 'Pterodactyl') }}</span>
<span class="logo-mini"><img src="favicons/android-chrome-192x192.png"></span>
<span class="logo-mini"><img src="/favicons/android-chrome-192x192.png"></span>
</a>
<nav class="navbar navbar-static-top">
<a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">

1
resources/themes/pterodactyl/server/files/edit.blade.php
View file

@ -52,6 +52,7 @@
<script>
$(document).ready(function () {
Editor.setValue($('#editorSetContent').val(), -1);
Editor.getSession().setUndoManager(new ace.UndoManager());
$('#editorLoadingOverlay').hide();
});
</script>