From a264967345f65e7270c9896a253f6ec098a5a7d5 Mon Sep 17 00:00:00 2001 From: Markus Poeschl Date: Tue, 2 Mar 2021 17:44:16 +0000 Subject: [PATCH 1/4] [red-night] Style scrollbars --- css/red-night.css | 76 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 74 insertions(+), 2 deletions(-) diff --git a/css/red-night.css b/css/red-night.css index f768ed6..e0afbe1 100644 --- a/css/red-night.css +++ b/css/red-night.css @@ -44,6 +44,78 @@ a:hover { text-decoration: none; } +body::-webkit-scrollbar, +body .scrollable::-webkit-scrollbar, +.scroll-wrapper::-webkit-scrollbar, +.modal .modal-body::-webkit-scrollbar, +.controls select::-webkit-scrollbar, +#settings_gcodeScripts .block.monospace::-webkit-scrollbar, +#settings_plugin_pluginmanager_pluginlist::-webkit-scrollbar, +#settings_plugin_pluginmanager_repositorydialog_list::-webkit-scrollbar, +#settings_plugin_softwareupdate_updatelist::-webkit-scrollbar { + width: 12px; +} + +body, +body .scrollable, +.scroll-wrapper, +.modal .modal-body, +.controls select, +#settings_gcodeScripts .block.monospace, +#settings_plugin_pluginmanager_pluginlist, +#settings_plugin_pluginmanager_repositorydialog_list, +#settings_plugin_softwareupdate_updatelist { + scrollbar-width: thin; + scrollbar-color: var(--accent-darker) var(--grey1); +} + +body::-webkit-scrollbar-track, +body .scrollable::-webkit-scrollbar-track, +.scroll-wrapper::-webkit-scrollbar-track, +.modal .modal-body::-webkit-scrollbar-track, +.controls select::-webkit-scrollbar-track, +#settings_gcodeScripts .block.monospace::-webkit-scrollbar-track, +#settings_plugin_pluginmanager_pluginlist::-webkit-scrollbar-track, +#settings_plugin_pluginmanager_repositorydialog_list::-webkit-scrollbar-track, +#settings_plugin_softwareupdate_updatelist::-webkit-scrollbar-track, +body::-webkit-scrollbar-corner, +body .scrollable::-webkit-scrollbar-corner, +.scroll-wrapper::-webkit-scrollbar-corner, +.modal .modal-body::-webkit-scrollbar-corner, +.controls select::-webkit-scrollbar-corner, +#settings_gcodeScripts .block.monospace::-webkit-scrollbar-corner, +#settings_plugin_pluginmanager_pluginlist::-webkit-scrollbar-corner, +#settings_plugin_pluginmanager_repositorydialog_list::-webkit-scrollbar-corner, +#settings_plugin_softwareupdate_updatelist::-webkit-scrollbar-corner { + background: var(--background-darker); +} + +body::-webkit-scrollbar-thumb, +body .scrollable::-webkit-scrollbar-thumb, +.scroll-wrapper::-webkit-scrollbar-thumb, +.modal .modal-body::-webkit-scrollbar-thumb, +.controls select::-webkit-scrollbar-thumb, +#settings_gcodeScripts .block.monospace::-webkit-scrollbar-thumb, +#settings_plugin_pluginmanager_pluginlist::-webkit-scrollbar-thumb, +#settings_plugin_pluginmanager_repositorydialog_list::-webkit-scrollbar-thumb, +#settings_plugin_softwareupdate_updatelist::-webkit-scrollbar-thumb { + background-color: var(--accent-darker) ; + border-radius: 2px; + border: 2px solid var(--background-darker); +} + +body::-webkit-resizer, +body .scrollable::-webkit-resizer, +.scroll-wrapper::-webkit-resizer, +.modal .modal-body::-webkit-resizer, +.controls select::-webkit-resizer, +#settings_gcodeScripts .block.monospace::-webkit-resizer, +#settings_plugin_pluginmanager_pluginlist::-webkit-resizer, +#settings_plugin_pluginmanager_repositorydialog_list::-webkit-resizer, +#settings_plugin_softwareupdate_updatelist::-webkit-resizer { + background: var(--grey1); +} + .accordion-group, .octoprint-container .tab-content { border: none; @@ -388,9 +460,9 @@ th i a.disabled { border-right: 2px solid var(--accent); } - .nav-collapse ul { +.nav-collapse ul { margin-bottom: 0; - } +} .navbar .nav-collapse .dropdown-menu li>a { color: var(--quiteWhite); From ff690a385ab78913ccfd931b6edda61143708e8a Mon Sep 17 00:00:00 2001 From: Markus Poeschl Date: Tue, 2 Mar 2021 17:48:27 +0000 Subject: [PATCH 2/4] [red-night] Fix white text on white background on user management --- css/red-night.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/css/red-night.css b/css/red-night.css index e0afbe1..4c13fd1 100644 --- a/css/red-night.css +++ b/css/red-night.css @@ -337,6 +337,10 @@ textarea:focus { color: var(--quiteWhite-dark); } +#settings_dialog .table .table { + background-color: var(--grey1); +} + td[class^=settings_] a, td i a, th[class^=settings_] a, From 11e6950564eeb0b0146a65712fad4db09fe5d52a Mon Sep 17 00:00:00 2001 From: Markus Poeschl Date: Tue, 2 Mar 2021 17:50:32 +0000 Subject: [PATCH 3/4] [red-night] Fix hidden print time genius star --- css/red-night.css | 1 + 1 file changed, 1 insertion(+) diff --git a/css/red-night.css b/css/red-night.css index 4c13fd1..79b2f4d 100644 --- a/css/red-night.css +++ b/css/red-night.css @@ -860,6 +860,7 @@ hr { .print-time-genius-after:after { transform: none; margin-left: 4px; + position: initial; } #psucontrol_indicator.on i { From fe4e40309f69f64ba2e267f6f6141f0a6fcb11b1 Mon Sep 17 00:00:00 2001 From: Markus Poeschl Date: Tue, 2 Mar 2021 17:59:44 +0000 Subject: [PATCH 4/4] [red-night] Fix new layout of File Manager plugin --- css/red-night.css | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/css/red-night.css b/css/red-night.css index 79b2f4d..18f94ad 100644 --- a/css/red-night.css +++ b/css/red-night.css @@ -537,6 +537,11 @@ th i a.disabled { background-color: var(--grey2); } +.table th, .table td { + border-bottom: 1px solid var(--accent); + border-top: none; +} + .modal { background-color: var(--grey1); } @@ -821,34 +826,13 @@ hr { box-shadow: 0 0 8px 4px var(--quiteWhite-transparent); } -#tab_plugin_filemanager .header { - background-color: var(--background); - border-bottom: 1px solid var(--accent); -} - -#tab_plugin_filemanager .header>div { - border-right: none; -} - -#tab_plugin_filemanager .container-fluid>.row-fluid { +#tab_plugin_filemanager .table-container { border: none; - border-radius: 0; - box-shadow: none; } -#tab_plugin_filemanager .entry-hover>div { +#tab_plugin_filemanager .header { + background-color: var(--background); border-bottom: 1px solid var(--accent); - border-left: 4px solid transparent; -} - -#tab_plugin_filemanager .entry-hover>div.selected { - background-color: var(--grey4); - border-left-color: var(--accent); -} - -#tab_plugin_filemanager .entry-hover>div:hover, -#tab_plugin_filemanager .entry-hover>div div:hover { - background-color: var(--grey2); } .print-time-genius-after:after,