Merge branch 'master' into 'master'

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

View File

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

View File

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

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">
<i class="fas fa-cogs"></i>Config</a>
</li>
<li>
<li class="nav-item">
<label class="p-0 m-0">
<input type="checkbox" name="stop_scroll" id="stop_scroll" />
{{ _('Stop Refresh') }}