Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

merging master with dev

Browse Source
This commit is contained in:
Phillip Tarrant 2020-12-11 07:47:31 -05:00
commit 688117ec87
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/frontend/static/assets/css/crafty.css
View File

@ -62,4 +62,21 @@
}
.term-nav-item {
padding: 1%;
}
/* Fix body scrollbar color */
body { background-color: var(--dark) !important; /* Firefox */ }
/* Webkit */
/* Didn't really work out
::-webkit-scrollbar { background-color: #202538; }
::-webkit-scrollbar-button { background-color: #1D212F; }
::-webkit-scrollbar-thumb { background-color: #777A86; }
::-webkit-scrollbar-thumb:hover { background-color: #646773; }
::-webkit-scrollbar-track { background-color: #202538; }
::-webkit-scrollbar-corner { background-color: #202538; }*/
.actions_serverlist > a > i {
cursor: pointer;
}

2
app/frontend/templates/panel/contribute.html
View File

@ -4,7 +4,7 @@
<!-- <meta http-equiv="refresh" content="60">-->
{% end %}
{% block title %}Crafty Controller - Blank Page{% end %}
{% block title %}Crafty Controller - Contribute{% end %}
{% block content %}

6
app/frontend/templates/panel/dashboard.html
View File

@ -124,7 +124,7 @@
</a>
</td>
<td>
<td class="actions_serverlist">
{% if server['stats'][0]['running'] %}
<a class="stop_button" data-id="{{server['server_data']['server_id']}}"> <i class="fas fa-stop"></i></a> &nbsp;
@ -136,7 +136,7 @@
</td>
<td>
<div class="progress" data-toggle="tooltip" data-placement="top" title="{{server['stats'][0]['cpu']}}">
<div class="progress mb-1" data-toggle="tooltip" data-placement="top" title="{{server['stats'][0]['cpu']}}">
<div class="progress-bar
{% if server['stats'][0]['cpu'] <= 33 %}
bg-success
@ -151,7 +151,7 @@
</td>
<td>
<div class="progress" data-toggle="tooltip" data-placement="top" title="{{server['stats'][0]['mem']}}">
<div class="progress mb-1" data-toggle="tooltip" data-placement="top" title="{{server['stats'][0]['mem']}}">
<div class="progress-bar
{% if server['stats'][0]['mem_percent'] <= 33 %}
bg-success