From 70b96c4ebc97a86a7024b5b078052e20dc976943 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 1 Mar 2021 16:04:16 +0200 Subject: [PATCH] remove gray-filter from et2_appicon for non-monochrome templates --- pixelegg/css/mobile.css | 15 +++++++++++++-- pixelegg/css/mobile.less | 1 - pixelegg/css/monochrome.less | 4 ---- pixelegg/css/pixelegg.css | 14 +++++++++++++- pixelegg/css/pixelegg.less | 1 - pixelegg/less/app_colors.less | 11 ++++++++++- pixelegg/mobile/fw_mobile.css | 15 +++++++++++++-- 7 files changed, 49 insertions(+), 12 deletions(-) diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css index aeb52da725..bb47db2f68 100644 --- a/pixelegg/css/mobile.css +++ b/pixelegg/css/mobile.css @@ -7,7 +7,6 @@ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @author Hadi Nategh * @package pixelegg - * @version $Id$ */ /** * EGroupware: pixelegg standard theme @@ -18,7 +17,6 @@ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @author Hadi Nategh * @package pixelegg - * @version $Id$ */ /** * EGroupware: Stylite Pixelegg template @@ -6740,6 +6738,19 @@ form[id^="ranking-"] .dialogHeadbar { #ranking_sidebox_header { border-left: 6px solid #404040 !important; } +img.et2_appicon, +.et2_appicon img, +table.egwGridView_grid img.et2_appicon { + /*filter grey*/ + filter: none; + -webkit-filter: initial; + -moz-filter: initial; + -ms-filter: initial; + -o-filter: initial; + /*filter: url(grayscale.svg); Firefox 4+ */ + filter: initial; + /* IE 6-9 */ +} #egw_fw_basecontainer.egw_fw_sidebar_toggleOn #addressbook_sidebox_header.egw_fw_ui_sidemenu_entry_header_active { background-color: rgba(0, 51, 102, 0.3); border-left: 4px solid #003366 !important; diff --git a/pixelegg/css/mobile.less b/pixelegg/css/mobile.less index c259cb91d9..558991c98d 100644 --- a/pixelegg/css/mobile.less +++ b/pixelegg/css/mobile.less @@ -7,7 +7,6 @@ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @author Hadi Nategh * @package pixelegg - * @version $Id$ */ @import "pixelegg.less"; diff --git a/pixelegg/css/monochrome.less b/pixelegg/css/monochrome.less index 15e7e3cdf3..e78175b42f 100644 --- a/pixelegg/css/monochrome.less +++ b/pixelegg/css/monochrome.less @@ -48,7 +48,3 @@ /*@import "../less/layout_nextmatch.less";*/ /*@import "../less/layout_footer.less";*/ /*@import "../less/layout_dialog.less";*/ - -// -// -// diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index 5fc833e698..51a157562b 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -7,7 +7,6 @@ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @author Hadi Nategh * @package pixelegg - * @version $Id$ */ /** * EGroupware: Stylite Pixelegg template @@ -6729,6 +6728,19 @@ form[id^="ranking-"] .dialogHeadbar { #ranking_sidebox_header { border-left: 6px solid #404040 !important; } +img.et2_appicon, +.et2_appicon img, +table.egwGridView_grid img.et2_appicon { + /*filter grey*/ + filter: none; + -webkit-filter: initial; + -moz-filter: initial; + -ms-filter: initial; + -o-filter: initial; + /*filter: url(grayscale.svg); Firefox 4+ */ + filter: initial; + /* IE 6-9 */ +} #egw_fw_basecontainer.egw_fw_sidebar_toggleOn #addressbook_sidebox_header.egw_fw_ui_sidemenu_entry_header_active { background-color: rgba(0, 51, 102, 0.3); border-left: 4px solid #003366 !important; diff --git a/pixelegg/css/pixelegg.less b/pixelegg/css/pixelegg.less index fd33dd4f85..aec1bd2437 100644 --- a/pixelegg/css/pixelegg.less +++ b/pixelegg/css/pixelegg.less @@ -7,7 +7,6 @@ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @author Hadi Nategh * @package pixelegg - * @version $Id$ */ @import "monochrome.less"; @import "../less/app_colors.less"; diff --git a/pixelegg/less/app_colors.less b/pixelegg/less/app_colors.less index 757ba1c56f..f3e1551995 100644 --- a/pixelegg/less/app_colors.less +++ b/pixelegg/less/app_colors.less @@ -11,6 +11,7 @@ * @version $Id: app.less 55033 2016-02-16 18:49:17Z hnategh $ */ +@import (reference) "./def_gradient.less"; // Color code for applications @addressbook-color: #003366; @@ -93,4 +94,12 @@ div[id^="wiki-"],form[id^="wiki-"] { div[id^="ranking-"],form[id^="ranking-"] { .nm_favorites_div .et2_dropdown button:nth-child(2),.plus_button,.search.nm-mob-header,.dialogHeadbar {background-color: @ranking-color;} } -#ranking_sidebox_header {border-left:6px solid @ranking-color !important;} \ No newline at end of file +#ranking_sidebox_header {border-left:6px solid @ranking-color !important;} + +// remove gray filter from et2_appicon +img.et2_appicon, +.et2_appicon img, +table.egwGridView_grid img.et2_appicon +{ + .img_filter_none; +} diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css index 6c5999e5b0..d8cf41a394 100644 --- a/pixelegg/mobile/fw_mobile.css +++ b/pixelegg/mobile/fw_mobile.css @@ -150,7 +150,6 @@ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @author Hadi Nategh * @package pixelegg - * @version $Id$ */ /** * EGroupware: pixelegg standard theme @@ -161,7 +160,6 @@ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @author Hadi Nategh * @package pixelegg - * @version $Id$ */ /** * EGroupware: Stylite Pixelegg template @@ -7722,6 +7720,19 @@ form[id^="ranking-"] .dialogHeadbar { #ranking_sidebox_header { border-left: 6px solid #404040 !important; } +img.et2_appicon, +.et2_appicon img, +table.egwGridView_grid img.et2_appicon { + /*filter grey*/ + filter: none; + -webkit-filter: initial; + -moz-filter: initial; + -ms-filter: initial; + -o-filter: initial; + /*filter: url(grayscale.svg); Firefox 4+ */ + filter: initial; + /* IE 6-9 */ +} /********************************/ /* */ /* MEDIA DEFINITION */