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

Merge branch 'master' into 'master'

Browse Source 
Master

See merge request crafty-controller/crafty-commander!1
This commit is contained in:
Phillip Tarrant 2020-09-17 22:28:48 +00:00
commit f049d6d453
3 changed files with 129 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

7
app/frontend/static/assets/css/shared/style.css
View File

@ -4088,7 +4088,7 @@ input[type="button"].btn-block {
.nav-tabs { .nav-tabs {
border-bottom: 1px solid #dee2e6; } border-bottom: 1px solid #dee2e6; }
.nav-tabs .nav-item { .nav-tabs .nav-item {
margin-bottom: -1px; } margin-bottom: -1px;}
.nav-tabs .nav-link { .nav-tabs .nav-link {
border: 1px solid transparent; border: 1px solid transparent;
border-top-left-radius: 0.25rem; border-top-left-radius: 0.25rem;
@ -15473,7 +15473,10 @@ ul {
position: relative; position: relative;
grid-template-columns: 70% 30%; grid-template-columns: 70% 30%;
grid-template-rows: auto; grid-template-rows: auto;
grid-template-areas: "product-image product-image" "product-title product-price" "product-variation product-actual-price" "product-description product-description"; } grid-template-areas: "product-image product-image"
"product-title product-price"
"product-variation product-actual-price"
"product-description product-description"; }
.product-item-wrapper .product-item .card-body .action-holder { .product-item-wrapper .product-item .card-body .action-holder {
position: absolute; position: absolute;
top: 0; top: 0;

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

@ -58,7 +58,7 @@
<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> <li class="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') }}