From 78e96001672ab46d2fe4a2c1f49ab4ab26fe97d0 Mon Sep 17 00:00:00 2001 From: Ross Mountjoy Date: Mon, 3 Feb 2020 20:09:43 -0500 Subject: [PATCH] fixed firefox scrollbar issue fixed error when background set to None added material color scheme colors fixed mobile issues --- dashmachine/sources.py | 4 +- .../static/css/global/dashmachine-theme.css | 53 ++++++++++++++++--- dashmachine/static/css/global/dashmachine.css | 28 ++++++---- .../static/css/settings_system/settings.css | 8 ++- dashmachine/static/js/global/dashmachine.js | 1 + dashmachine/templates/main/home.html | 6 +-- dashmachine/templates/main/layout.html | 2 +- .../templates/settings_system/settings.html | 20 ++++--- dashmachine/version.py | 2 +- 9 files changed, 93 insertions(+), 31 deletions(-) diff --git a/dashmachine/sources.py b/dashmachine/sources.py index a470d8f..3b771f3 100644 --- a/dashmachine/sources.py +++ b/dashmachine/sources.py @@ -13,8 +13,8 @@ context processor to make the process functions available to every jinja templat Load orders in bundles are respected here""" """You can disable minification for debug purposes here (set to True) """ -debug_js = False -debug_css = False +debug_js = True +debug_css = True def process_js_sources(process_bundle=None, src=None, app_global=False): diff --git a/dashmachine/static/css/global/dashmachine-theme.css b/dashmachine/static/css/global/dashmachine-theme.css index 8a66f9a..f8e3f5b 100644 --- a/dashmachine/static/css/global/dashmachine-theme.css +++ b/dashmachine/static/css/global/dashmachine-theme.css @@ -23,19 +23,60 @@ --theme-color-font-muted: #f9f9f9; --theme-warning: #dc584e; } -[data-accent="green"] { - --theme-primary: #49B03E; +[data-accent="red"] { + --theme-primary: #f44336; } [data-accent="pink"] { - --theme-primary: #EE1289; + --theme-primary: #e91e63; +} +[data-accent="purple"] { + --theme-primary: #9c27b0; +} +[data-accent="deepPurple"] { + --theme-primary: #673ab7; +} +[data-accent="indigo"] { + --theme-primary: #3f51b5; } [data-accent="blue"] { - --theme-primary: #5151b0; + --theme-primary: #2196f3; +} +[data-accent="lightBlue"] { + --theme-primary: #03a9f4; +} +[data-accent="cyan"] { + --theme-primary: #00bcd4; +} +[data-accent="teal"] { + --theme-primary: #009688; +} +[data-accent="green"] { + --theme-primary: #4caf50; +} +[data-accent="lightGreen"] { + --theme-primary: #8bc34a; +} +[data-accent="lime"] { + --theme-primary: #cddc39; +} +[data-accent="yellow"] { + --theme-primary: #ffeb3b; +} +[data-accent="amber"] { + --theme-primary: #ffc107; +} +[data-accent="deepOrange"] { + --theme-primary: #ff5722; +} +[data-accent="brown"] { + --theme-primary: #795548; } [data-accent="grey"] { - --theme-primary: #C6C3CC; + --theme-primary: #9e9e9e; +} +[data-accent="blueGrey"] { + --theme-primary: #607d8b; } - /* THEME CLASSES */ .theme-surface { background-color: var(--theme-surface) !important; diff --git a/dashmachine/static/css/global/dashmachine.css b/dashmachine/static/css/global/dashmachine.css index 92aad3f..439d717 100644 --- a/dashmachine/static/css/global/dashmachine.css +++ b/dashmachine/static/css/global/dashmachine.css @@ -50,6 +50,8 @@ body { user-select: none; /* Non-prefixed version, currently supported by Chrome, Opera and Firefox */ + scrollbar-color: var(--theme-secondary); + scrollbar-width: thin; } html { @@ -328,15 +330,15 @@ input:disabled { .navbar .navbar-light ul a { color: var(--theme-color-font); } -@media (min-width: 900px) -{ - .sidenav-overlay - { - display: none !important; +/*@media (min-width: 900px)*/ +/*{*/ +/* .sidenav-overlay*/ +/* {*/ +/* display: none !important;*/ - opacity: 0 !important; - } -} +/* opacity: 0 !important;*/ +/* }*/ +/*}*/ /* MODALS AND CARDS */ .modal { @@ -615,6 +617,14 @@ input:disabled { .sidenav { background-color: var(--theme-surface); top: unset; + overflow: scroll; + scrollbar-width: none; +} + +#sidenav-mobile-toggle-btn { + position: fixed; + top: unset; + bottom: 10px; } .border-bottom-1 { @@ -770,4 +780,4 @@ span.badge.new { /*FAB*/ .tap-target-wave::before, .tap-target-wave::after { background-color: var(--theme-background); -} \ No newline at end of file +} diff --git a/dashmachine/static/css/settings_system/settings.css b/dashmachine/static/css/settings_system/settings.css index b724638..293b145 100644 --- a/dashmachine/static/css/settings_system/settings.css +++ b/dashmachine/static/css/settings_system/settings.css @@ -1,5 +1,9 @@ -body { - overflow: hidden !important; + +@media (min-width: 990px) +{ + body { + overflow: hidden !important; + } } .settings-page-card { diff --git a/dashmachine/static/js/global/dashmachine.js b/dashmachine/static/js/global/dashmachine.js index 0349fab..9ebbf19 100644 --- a/dashmachine/static/js/global/dashmachine.js +++ b/dashmachine/static/js/global/dashmachine.js @@ -201,6 +201,7 @@ $(document).ready(function () { } }, 300); + $("#slide-out").sidenav(); // Collapsible navigation menu $(".nav-collapsible .navbar-toggler").click(function() { diff --git a/dashmachine/templates/main/home.html b/dashmachine/templates/main/home.html index e0b7a2f..ec54380 100755 --- a/dashmachine/templates/main/home.html +++ b/dashmachine/templates/main/home.html @@ -5,7 +5,7 @@ {% endblock page_vendor_css %} {% block page_lvl_css %} - {% if settings.background %} + {% if settings.background and settings.background != 'None' %} {% endif %} @@ -22,7 +23,9 @@
-

Config.ini Readme

+

Config.ini Readme + close +

Settings Reference
@@ -33,7 +36,7 @@ background = static/images/backgrounds/background.png
- +
@@ -59,7 +62,10 @@ - + @@ -82,7 +88,7 @@ data_template = None -
Variableaccent Yes UI accent colororange, green, blue, green, pink, grey + orange, red, pink, purple, deepPurple, indigo, blue, lightBlue, + cyan, teal, green, lightGreen, lime, yellow, amber, deepOrange, brown, grey, blueGrey +
background
+
@@ -151,7 +157,7 @@ value_template = variable_name
-
Variable
+
diff --git a/dashmachine/version.py b/dashmachine/version.py index f38f71f..35520dc 100755 --- a/dashmachine/version.py +++ b/dashmachine/version.py @@ -1 +1 @@ -version = "v0.21" +version = "v0.22"
Variable