StarMC/Astral-nook
StarMC/Astral-nook
Archived
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

2
resources/views/layouts/master.blade.php
View file

@ -106,7 +106,7 @@
$('#applyUpdate').removeClass('fa-circle-o-notch fa-spinner fa-spin fa-check-circle fa-times-circle').addClass(selector).css({ color: color });
});
// Socket Recieves New Status from Scales
// Socket Recieves New Status from Daemon
socket.on('status', function(data) {
var newStatus, selector = 'fa-times-circle';
var color = '#E33200';