From 88622c0d915cd2bacac484fc412bc349e85fb188 Mon Sep 17 00:00:00 2001 From: Matthieu Leproux Date: Thu, 6 May 2021 14:38:43 +0200 Subject: [PATCH] Fixes #1400 ViewSelector in DarkMode done ViewSelector for Plugin Manager, User Manager and Album manager. --- admin/themes/default/template/cat_list.tpl | 11 ------ .../default/template/plugins_installed.tpl | 10 ------ admin/themes/default/template/user_list.tpl | 10 ------ admin/themes/default/theme.css | 20 ++++++++++- admin/themes/roma/theme.css | 36 +++++++++++++++++-- 5 files changed, 52 insertions(+), 35 deletions(-) diff --git a/admin/themes/default/template/cat_list.tpl b/admin/themes/default/template/cat_list.tpl index 6a96ce5e8..701b708af 100644 --- a/admin/themes/default/template/cat_list.tpl +++ b/admin/themes/default/template/cat_list.tpl @@ -97,7 +97,6 @@ jQuery(document).ready(function(){ padding: 7px 0px; margin-right: 0px; border-radius: 10px; - background: #fafafa !important; } .AlbumViewSelector span { @@ -126,15 +125,6 @@ jQuery(document).ready(function(){ transition: 0.3s; } -.AlbumViewSelector input:checked + label{ - background: transparent; - color: white !important; -} - -.AlbumViewSelector input:checked + label span{ - background: orange; -} - .switchLayout { display: none; } @@ -143,7 +133,6 @@ jQuery(document).ready(function(){ font-size: 14px; } - .categoryContainer { padding: 0 20px 0 20px; } diff --git a/admin/themes/default/template/plugins_installed.tpl b/admin/themes/default/template/plugins_installed.tpl index af35354d8..99c591dff 100644 --- a/admin/themes/default/template/plugins_installed.tpl +++ b/admin/themes/default/template/plugins_installed.tpl @@ -405,7 +405,6 @@ jQuery(".pluginMiniBox").each(function(index){ padding: 0px; margin-right: 0px; border-radius: 7px; - {* background: #fafafa !important; *} } .AlbumViewSelector span { @@ -430,15 +429,6 @@ jQuery(".pluginMiniBox").each(function(index){ transition: 0.3s; } -.AlbumViewSelector input:checked + label{ - background: transparent; - color: white; -} - -.AlbumViewSelector input:checked + label span{ - background: orange; -} - .switchLayout { display: none; } diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl index 64bc6ff33..a033c1ab1 100644 --- a/admin/themes/default/template/user_list.tpl +++ b/admin/themes/default/template/user_list.tpl @@ -2077,7 +2077,6 @@ Advanced filter padding: 6px 0px; margin-right: 0px; border-radius: 10px; - background: #fafafa !important; position: absolute; z-index: 2; @@ -2106,15 +2105,6 @@ Advanced filter transition: 0.3s; } -.UserViewSelector input:checked + label{ - background: transparent; - color: white !important; -} - -.UserViewSelector input:checked + label span{ - background: orange; -} - .switchLayout { display: none; } diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index 0ce7240a9..ed9fd8595 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -4903,4 +4903,22 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important; text-decoration: none; } -.doubleSelect p {display:flex; justify-content: center;} \ No newline at end of file +.doubleSelect p {display:flex; justify-content: center;} + +/* View selectors css (colors)*/ + +.AlbumViewSelector, .UserViewSelector { + background: #fafafa !important; +} + +.AlbumViewSelector input:checked + label, +.UserViewSelector input:checked + label{ + background: transparent; + color: white; +} + +.AlbumViewSelector input:checked + label span, +.UserViewSelector input:checked + label span{ + background: orange; +} + diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css index 2f80458b0..e11025356 100644 --- a/admin/themes/roma/theme.css +++ b/admin/themes/roma/theme.css @@ -277,8 +277,6 @@ a.stat-box:hover { #helpContent, #pLoaderPage, #ftpPage, #ftpPage LEGEND {color:#aaa;} -.AlbumViewSelector {background: #555555;} -.AlbumViewSelector input:checked + label span {color: #999999;} .pluginBox, .pluginContent, .pluginMiniBox, .groups li, .groups .GroupContainer {background-color:#333;color:#999;border-right-color:#333; box-shadow: none;} .pluginMiniBox {border-left: none;} .pluginBoxNameCell, .pluginMiniBoxNameCell {color:#aaa;} @@ -804,7 +802,6 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important; .buttonSeparator {color: #c1c1c1;} #cboxTitle {color: #7f7f7f !important;} #addAlbumForm {color: #999;} -.selectedAlbum span {background-color: #555; color: #999;} #uploadForm li.plupload_droptext {background-color: #343434!important; color: #777 !important;} .addFilesButtonChanged {background-color: #888;} .addFilesButtonChanged:hover {background-color: #777;} @@ -1106,4 +1103,37 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important; .move-cat-container .move-cat-toogler{ color:#ffa744; +} + +/*Album view selector css*/ + +.AlbumViewSelector, .UserViewSelector { + background:#555 !important; +} + +.AlbumViewSelector input:checked + label, +.UserViewSelector input:checked + label{ + background: transparent; + color: white; +} + +.AlbumViewSelector input:checked + label span, +.UserViewSelector input:checked + label span{ + background: orange; +} + +.AlbumViewSelector input:checked + label .icon-th-large, +.AlbumViewSelector input:checked + label .icon-th-list, +.AlbumViewSelector input:checked + label .icon-pause { + color: #444; +} + +.UserViewSelector input:checked + label .icon-th-large, +.UserViewSelector input:checked + label .icon-th-list, +.UserViewSelector input:checked + label .icon-pause { + color: #444; +} + +.icon-th-large, .icon-th-list, .icon-pause { + color: #c1c1c1; } \ No newline at end of file