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

@ -59,4 +59,7 @@
.scrollable-element { .scrollable-element {
scrollbar-color: red yellow; scrollbar-color: red yellow;
}
.nav-item {
padding: 1%;
} }

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

@ -1,124 +1,124 @@
/*------------------------------------------------------------------ /*------------------------------------------------------------------
[Master Stylesheet] [Master Stylesheet]
Project: Star Admin Project: Star Admin
Version: 3.8.0 Version: 3.8.0
-------------------------------------------------------------------*/ -------------------------------------------------------------------*/
/*------------------------------------------------------------------- /*-------------------------------------------------------------------
===== Table of Contents ===== ===== Table of Contents =====
* Bootstrap functions * Bootstrap functions
* Template variables * Template variables
* Boostrap Main SCSS * Boostrap Main SCSS
* Template mixins * Template mixins
+ Animation Mixins + Animation Mixins
+ Accordion Mixins + Accordion Mixins
+ Background Mixins + Background Mixins
+ Badges Mixins + Badges Mixins
+ BlockQuote Mixins + BlockQuote Mixins
+ Buttons Mixins + Buttons Mixins
+ Breadcrumbs Mixins + Breadcrumbs Mixins
+ Cards Mixins + Cards Mixins
+ Color Functions Mixins + Color Functions Mixins
+ Miscellaneous Mixins + Miscellaneous Mixins
+ No-ui-slider Mixins + No-ui-slider Mixins
+ Pagination Mixins + Pagination Mixins
+ Popover Mixins + Popover Mixins
+ Tabs Mixins + Tabs Mixins
+ Tooltip Mixins + Tooltip Mixins
+ Text Mixins + Text Mixins
* Core Styles * Core Styles
+ Reset Styles + Reset Styles
+ Fonts + Fonts
+ Functions + Functions
+ Typography + Typography
+ Miscellaneous + Miscellaneous
+ Layouts + Layouts
+ Utilities + Utilities
+ Demo styles + Demo styles
+ Dashboard + Dashboard
* Components * Components
+ Accordions + Accordions
+ Badges + Badges
+ Bootstrap Alerts + Bootstrap Alerts
+ Boostrap Progress + Boostrap Progress
+ Buttons + Buttons
+ Breadcrumbs + Breadcrumbs
+ Cards + Cards
+ Checkboxes and Radios + Checkboxes and Radios
+ Dropdowns + Dropdowns
+ Forms + Forms
+ Google Maps + Google Maps
+ Icons + Icons
+ Lists + Lists
+ Loaders + Loaders
+ Modals + Modals
+ New Accounts + New Accounts
+ Pagination + Pagination
+ Popovers + Popovers
+ Portfolio + Portfolio
+ Preview + Preview
+ Pricing Table + Pricing Table
+ Tables + Tables
+ Tabs + Tabs
+ Tooltips + Tooltips
+ Timeline + Timeline
+ Todo List + Todo List
+ Settings Panel + Settings Panel
+ User Profile + User Profile
+ Purchase Banner + Purchase Banner
* Email * Email
+ Mail Sidebar + Mail Sidebar
+ Mail List Container + Mail List Container
+ Message Content + Message Content
* Plugin Overrides * Plugin Overrides
+ Ace Editor + Ace Editor
+ Avgrund Popup + Avgrund Popup
+ Bootstrap Tour + Bootstrap Tour
+ Chartjs + Chartjs
+ Chartist + Chartist
+ CodeMirror + CodeMirror
+ Colcade + Colcade
+ Colorpicker + Colorpicker
+ Context Menu + Context Menu
+ Data Tables + Data Tables
+ Datepicker + Datepicker
+ Dropify + Dropify
+ Dropzone + Dropzone
+ Flot chart + Flot chart
+ Full Calendar + Full Calendar
+ Google Charts + Google Charts
+ Icheck + Icheck
+ Jquery File Upload + Jquery File Upload
+ Js-grid + Js-grid
+ Jvectormap + Jvectormap
+ Light Gallery + Light Gallery
+ Listify + Listify
+ No-ui-slider + No-ui-slider
+ Owl-carousel + Owl-carousel
+ Progressbar-js + Progressbar-js
+ Pws-tabs + Pws-tabs
+ Quill Editor + Quill Editor
+ Rating + Rating
+ Select2 + Select2
+ Summernote Editor + Summernote Editor
+ SweetAlert + SweetAlert
+ Switchery + Switchery
+ Tags + Tags
+ TinyMCE Editor + TinyMCE Editor
+ Toast + Toast
+ Typeahead + Typeahead
+ Wysi Editor + Wysi Editor
+ X-editable + X-editable
+ Wizard + Wizard
* Screens * Screens
+ Auth + Auth
+ Error + Error
+ Lock Screen + Lock Screen
+ Landing + Landing
+ Profile Page + Profile Page
+ Invoice + Invoice
+ Tickets + Tickets
-------------------------------------------------------------------*/ -------------------------------------------------------------------*/
/*-------------------------------------------------------------------*/ /*-------------------------------------------------------------------*/
/* === Import Bootstrap functions and variables === */ /* === Import Bootstrap functions and variables === */
@ -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') }}