Merge branch 'dev' into 'master'

Added term-nav-item class and applied padding. Fixes spacing on nav-item classes on Dashboard

See merge request crafty-controller/crafty-commander!3
This commit is contained in:
Phillip Tarrant 2020-09-18 15:59:55 +00:00
commit ab3ee9a25e
2 changed files with 8 additions and 8 deletions

View File

@ -60,6 +60,6 @@
.scrollable-element { .scrollable-element {
scrollbar-color: red yellow; scrollbar-color: red yellow;
} }
.nav-item { .term-nav-item {
padding: 1%; padding: 1%;
} }

View File

@ -34,31 +34,31 @@
<div class="card-body pt-0"> <div class="card-body pt-0">
<ul class="nav nav-tabs col-md-12 tab-simple-styled " role="tablist"> <ul class="nav nav-tabs col-md-12 tab-simple-styled " role="tablist">
<li class="nav-item"> <li class="nav-item term-nav-item">
<a class="nav-link active" href="/panel/server_detail?id={{ data['server_stats'][0]['server_id']['server_id'] }}&subpage=term" role="tab" aria-selected="true"> <a class="nav-link active" href="/panel/server_detail?id={{ data['server_stats'][0]['server_id']['server_id'] }}&subpage=term" role="tab" aria-selected="true">
<i class="fas fa-file-signature"></i>Terminal</a> <i class="fas fa-file-signature"></i>Terminal</a>
</li> </li>
<li class="nav-item"> <li class="nav-item term-nav-item">
<a class="nav-link" href="/panel/server_detail?id={{ data['server_stats'][0]['server_id']['server_id'] }}&subpage=logs" role="tab" aria-selected="false"> <a class="nav-link" href="/panel/server_detail?id={{ data['server_stats'][0]['server_id']['server_id'] }}&subpage=logs" role="tab" aria-selected="false">
<i class="fas fa-file-signature"></i>Logs</a> <i class="fas fa-file-signature"></i>Logs</a>
</li> </li>
<li class="nav-item"> <li class="nav-item term-nav-item">
<a class="nav-link" href="/panel/server_detail?id={{ data['server_stats'][0]['server_id']['server_id'] }}&subpage=tasks" role="tab" aria-selected="false"> <a class="nav-link" href="/panel/server_detail?id={{ data['server_stats'][0]['server_id']['server_id'] }}&subpage=tasks" role="tab" aria-selected="false">
<i class="fas fa-clock"></i>Schedule</a> <i class="fas fa-clock"></i>Schedule</a>
</li> </li>
<li class="nav-item"> <li class="nav-item term-nav-item">
<a class="nav-link" href="/panel/server_detail?id={{ data['server_stats'][0]['server_id']['server_id'] }}&subpage=backup" role="tab" aria-selected="false"> <a class="nav-link" href="/panel/server_detail?id={{ data['server_stats'][0]['server_id']['server_id'] }}&subpage=backup" role="tab" aria-selected="false">
<i class="fas fa-save"></i>Backup</a> <i class="fas fa-save"></i>Backup</a>
</li> </li>
<li class="nav-item"> <li class="nav-item term-nav-item">
<a class="nav-link" href="/panel/server_detail?id={{ data['server_stats'][0]['server_id']['server_id'] }}&subpage=files" role="tab" aria-selected="false"> <a class="nav-link" href="/panel/server_detail?id={{ data['server_stats'][0]['server_id']['server_id'] }}&subpage=files" role="tab" aria-selected="false">
<i class="fas fa-folder-tree"></i>Files</a> <i class="fas fa-folder-tree"></i>Files</a>
</li> </li>
<li class="nav-item"> <li class="nav-item term-nav-item">
<a class="nav-link" href="/panel/server_detail?id={{ data['server_stats'][0]['server_id']['server_id'] }}&subpage=config" role="tab" aria-selected="false"> <a class="nav-link" href="/panel/server_detail?id={{ data['server_stats'][0]['server_id']['server_id'] }}&subpage=config" role="tab" aria-selected="false">
<i class="fas fa-cogs"></i>Config</a> <i class="fas fa-cogs"></i>Config</a>
</li> </li>
<li class="nav-item"> <li class="nav-item term-nav-item">
<label class="p-0 m-0"> <label class="p-0 m-0">
<input type="checkbox" name="stop_scroll" id="stop_scroll" /> <input type="checkbox" name="stop_scroll" id="stop_scroll" />
{{ _('Stop Refresh') }} {{ _('Stop Refresh') }}