From 1d3f66438175686d33c3d7a055c89a1f6dcfd34b Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Wed, 6 Mar 2019 13:04:20 +0100 Subject: [PATCH] cleanup framework to take SVG icons always into account unless it's not found --- api/images.php | 2 +- api/src/Framework.php | 12 +- api/src/Framework/Ajax.php | 2 +- api/src/Image.php | 47 +----- pixelegg/css/mobile.css | 197 ++++++++++++------------ pixelegg/css/monochrome.css | 177 +++++++++++---------- pixelegg/css/monochrome.less | 2 +- pixelegg/css/pixelegg.css | 177 +++++++++++---------- pixelegg/images/apply.svg | 4 +- pixelegg/images/cancel.svg | 4 +- pixelegg/images/save.svg | 4 +- pixelegg/less/def_colors.less | 18 +-- pixelegg/less/def_gradient.less | 21 ++- pixelegg/less/layout_dhtmlSubmenu.less | 29 ++-- pixelegg/less/layout_raster_header.less | 16 +- pixelegg/mobile/fw_mobile.css | 197 ++++++++++++------------ 16 files changed, 430 insertions(+), 479 deletions(-) diff --git a/api/images.php b/api/images.php index 1ecf45d9a7..0d82d5aecd 100644 --- a/api/images.php +++ b/api/images.php @@ -28,7 +28,7 @@ $GLOBALS['egw_info'] = array( include '../header.inc.php'; -$content = json_encode(Api\Image::map(preg_match('/^[a-z0-9_-]+$/i',$_GET['template']) ? $_GET['template'] : null, $_GET['svg']), +$content = json_encode(Api\Image::map(preg_match('/^[a-z0-9_-]+$/i',$_GET['template']) ? $_GET['template'] : null), JSON_FORCE_OBJECT | // export empty php-arrays as empty objects, not empty arrays JSON_UNESCAPED_SLASHES | // do not escape slashes, smaller and better readable (!empty($_GET['debug']) ? JSON_PRETTY_PRINT : 0)); diff --git a/api/src/Framework.php b/api/src/Framework.php index b050947393..6a9851154d 100644 --- a/api/src/Framework.php +++ b/api/src/Framework.php @@ -777,11 +777,9 @@ abstract class Framework extends Framework\Extra * * This is similar to the former common::navbar() method - though it returns the vars and does not place them in global scope. * - * @param boolean $svg =false should svg images be returned or not: - * true: always return svg, false: never return svg (current default), null: browser dependent, see svg_usable() * @return array */ - protected static function _get_navbar_apps($svg=false) + protected static function _get_navbar_apps() { $first = key($GLOBALS['egw_info']['user']['apps']); if(is_array($GLOBALS['egw_info']['user']['apps']['admin']) && $first != 'admin') @@ -833,7 +831,7 @@ abstract class Framework extends Framework\Extra $icon = isset($data['icon']) ? $data['icon'] : 'navbar'; $icon_app = isset($data['icon_app']) ? $data['icon_app'] : $app; - $apps[$app]['icon'] = $apps[$app]['icon_hover'] = Image::find($icon_app,Array($icon,'nonav'),'',$svg); + $apps[$app]['icon'] = $apps[$app]['icon_hover'] = Image::find($icon_app,Array($icon,'nonav'),''); } } @@ -986,11 +984,7 @@ abstract class Framework extends Framework\Extra )); self::includeJS('/api/images.php', array( 'template' => $GLOBALS['egw_info']['server']['template_set'], - 'etag' => md5(json_encode(Image::map($GLOBALS['egw_info']['server']['template_set']))), - 'svg' => Header\UserAgent::mobile() || $GLOBALS['egw_info']['user']['preferences']['common']['theme'] == 'pixelegg' || - // if theme was set to something else before and we default to "pixelegg", we need it here too - $GLOBALS['egw_info']['server']['template_set'] == 'pixelegg' && - $GLOBALS['egw_info']['user']['preferences']['common']['theme'] !== 'monochrome', + 'etag' => md5(json_encode(Image::map($GLOBALS['egw_info']['server']['template_set']))) )); self::includeJS('/api/user.php', array( 'user' => $GLOBALS['egw_info']['user']['account_lid'], diff --git a/api/src/Framework/Ajax.php b/api/src/Framework/Ajax.php index 3858fd24ac..adf4735128 100755 --- a/api/src/Framework/Ajax.php +++ b/api/src/Framework/Ajax.php @@ -789,7 +789,7 @@ abstract class Ajax extends Api\Framework */ public function navbar_apps() { - $apps = parent::_get_navbar_apps(Api\Image::svg_usable()); // use svg if usable in browser + $apps = parent::_get_navbar_apps(); //Add its sidebox width to each app foreach ($apps as $app => &$data) diff --git a/api/src/Image.php b/api/src/Image.php index 6142706a00..c959572c13 100644 --- a/api/src/Image.php +++ b/api/src/Image.php @@ -25,24 +25,12 @@ class Image * @param string $app * @param string|array $image one or more image-name in order of precedence * @param string $extension ='' extension to $image, makes sense only with an array - * @param boolean $_svg =false should svg images be returned or not: - * true: always return svg, false: never return svg (current default), null: browser dependent, see svg_usable() + * * @return string url of image or null if not found */ - static function find($app,$image,$extension='',$_svg=false) + static function find($app,$image,$extension='') { - $svg = Header\UserAgent::mobile() || $GLOBALS['egw_info']['user']['preferences']['common']['theme'] == 'pixelegg' ? null : $_svg; - static $image_map_no_svg = null, $image_map_svg = null; - if (is_null($svg)) $svg = self::svg_usable (); - if ($svg) - { - $image_map =& $image_map_svg; - } - else - { - $image_map =& $image_map_no_svg; - } - if (is_null($image_map)) $image_map = self::map(null, $svg); + $image_map = self::map(null); // array of images in descending precedence if (is_array($image)) @@ -106,18 +94,6 @@ class Image return $ext; } - /** - * Does browser support svg - * - * All non IE and IE 9+ - * - * @return boolean - */ - public static function svg_usable() - { - return Header\UserAgent::type() !== 'msie' || Header\UserAgent::version() >= 9; - } - /** * Scan filesystem for images of all apps * @@ -127,32 +103,25 @@ class Image * VFS image directory is treated like an application named 'vfs'. * * @param string $template_set =null 'default', 'idots', 'jerryr', default is template-set from user prefs - * @param boolean $svg =null prefer svg images, default for all browsers but IE<9 + * * @return array of application => image-name => full path */ - public static function map($template_set=null, $svg=null) + public static function map($template_set=null) { if (is_null($template_set)) { $template_set = $GLOBALS['egw_info']['server']['template_set']; } - if (is_null($svg)) - { - $svg = self::svg_usable(); - } - $cache_name = 'image_map_'.$template_set.($svg ? '_svg' : '').(Header\UserAgent::mobile() ? '_mobile' : ''); + $cache_name = 'image_map_'.$template_set.'_svg'.(Header\UserAgent::mobile() ? '_mobile' : ''); if (($map = Cache::getInstance(__CLASS__, $cache_name))) { return $map; } //$starttime = microtime(true); - // priority: : PNG->JPG->GIF - $img_types = array('png','jpg','gif','ico'); - - // if we want svg, prepend it to img-types - if ($svg) array_unshift ($img_types, 'svg'); + // priority: : SVG->PNG->JPG->GIF->ICO + $img_types = array('svg','png','jpg','gif','ico'); $map = array(); foreach(scandir(EGW_SERVER_ROOT) as $app) diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css index 539d1bf243..8b873cb715 100644 --- a/pixelegg/css/mobile.css +++ b/pixelegg/css/mobile.css @@ -71,11 +71,11 @@ table.egwGridView_grid img.et2_appicon { /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -174,14 +174,14 @@ background-repeat: repeat-x; } img.et2_button_icon[src*="svg"]:hover { - background-color: #1aa200; - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMWFhMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMWFhMjAwIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); - background-image: -moz-linear-gradient(top, #1aa200, #1aa200); - background-image: -ms-linear-gradient(top, #1aa200, #1aa200); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#1aa200), to(#1aa200)); - background-image: -webkit-linear-gradient(top, #1aa200, #1aa200); - background-image: -o-linear-gradient(top, #1aa200, #1aa200); - background-image: linear-gradient(top, #1aa200, #1aa200); + background-color: #b3e4a6; + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjNlNGE2IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjNlNGE2IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); + background-image: -moz-linear-gradient(top, #b3e4a6, #b3e4a6); + background-image: -ms-linear-gradient(top, #b3e4a6, #b3e4a6); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b3e4a6), to(#b3e4a6)); + background-image: -webkit-linear-gradient(top, #b3e4a6, #b3e4a6); + background-image: -o-linear-gradient(top, #b3e4a6, #b3e4a6); + background-image: linear-gradient(top, #b3e4a6, #b3e4a6); background-repeat: repeat-x; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); @@ -264,14 +264,14 @@ fill: red !important; } span.et2_file_span:hover { - background-color: #189800 !important; + background-color: #ace29e !important; color: #000000 !important; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; } span.et2_file_span:active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } div.et2_file input.et2_file_upload { background-color: #FFFFFF !important; @@ -288,7 +288,7 @@ -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } /* Gantt widget */ .et2_gantt .gantt_task_line { @@ -658,7 +658,7 @@ -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); - background-color: #1aa200; + background-color: #b3e4a6; } /*################################################################ * @@ -735,7 +735,7 @@ } .et2_dropdown button.ui-corner-left:active, .et2_dropdown button.ui-state-default:active { - background-color: #1aa200; + background-color: #b3e4a6; } .et2_dropdown button.ui-state-hover { background-color: #E6E6E6; @@ -1253,7 +1253,7 @@ option:checked { background-color: transparent; } .ui-icon-close:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; } span.ui-icon-close { margin-top: 0px; @@ -1284,7 +1284,7 @@ span.ui-icon-close { -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important; -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important; box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important; - background-color: #fecc44 !important; + background-color: #fff0c7 !important; } /*###########################################*/ /*Menu */ @@ -1522,20 +1522,20 @@ div#ui-datepicker-div { background-color: #679FD2; } .ui-datepicker button.ui-datepicker-current .ui-state-hover { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } .ui-datepicker button.ui-datepicker-current .ui-state-hover:active { - background-color: #1aa200; + background-color: #b3e4a6; } .ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current:active { - background-color: #1aa200; + background-color: #b3e4a6; } .ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-close:hover { - background-color: #f5b301 !important; + background-color: #ffdb7a !important; color: #000000; } .ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-close:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; color: #373737; } .ui-widget-overlay, @@ -2160,7 +2160,7 @@ input[type=button]:hover { -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); - background-color: #1aa200; + background-color: #b3e4a6; background-size: 16px 16px; } button.et2_button_text:active, @@ -2272,7 +2272,7 @@ button[id="calendar-edit_button[delete]"]:hover, button[id="timesheet-edit_button[delete]"]:hover, button[id="displayToolbar-delete"]:hover, button.et2_button_delete:hover { - background-color: #b81f00 !important; + background-color: #ff8f78 !important; /*.border_normal;*/ /*.box_shadow_standard_light;*/ /*.rounded (3px);*/ @@ -2309,7 +2309,7 @@ button[id="calendar-edit_button[delete]"]:active, button[id="timesheet-edit_button[delete]"]:active, button[id="displayToolbar-delete"]:active, button.et2_button_delete:active { - background-color: #e12500 !important; + background-color: #ffb1a1 !important; /*.border_normal;*/ /*.box_shadow_standard_light;*/ /*.rounded (3px);*/ @@ -2362,7 +2362,7 @@ button[id*="apply"]:hover, button[id*="copy"]:hover, button[id*="edit_button[edit]"]:hover, button.et2_button:hover { - background-color: #189800; + background-color: #ace29e; color: #000000; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); @@ -2373,7 +2373,7 @@ button[id*="apply"]:active, button[id*="copy"]:active, button[id*="edit_button[edit]"]:active, button.et2_button:active { - background-color: #1aa200; + background-color: #b3e4a6; } button[id*="add"]:not([id*='addressbook']) img[url*="svg"] { background-color: #b4b4b4 !important; @@ -2388,17 +2388,17 @@ button[id*="add"]:not([id*='addressbook']) img[url*="svg"] { fill: red !important; } button[id*="add"]:not([id*='addressbook']):hover { - background-color: #189800 !important; + background-color: #ace29e !important; color: #000000 !important; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; } button[id*="add"]:not([id*='addressbook']):active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } button#filemanager-select_button[ok]:active { - background-color: #1aa200; + background-color: #b3e4a6; } #passwordchange { background-image: url('../images/cancel.png') !important; @@ -2428,13 +2428,13 @@ button#filemanager-select_button[ok]:active { height: 24px; } #passwordchange:hover { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); } #passwordchange:active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -2450,7 +2450,7 @@ button#cancel:hover, #cancel:hover, button.et2_button_cancel:hover, button.et2_button_question:hover { - background-color: #f5b301 !important; + background-color: #ffdb7a !important; color: #000000; } button[id*="cancel"]:active, @@ -2459,7 +2459,7 @@ button#cancel:active, #cancel:active, button.et2_button_cancel:active, button.et2_button_question:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; color: #373737; } /* et2_box_widget ###*/ @@ -2495,7 +2495,7 @@ button#cancel { } button[id="cancel"]:hover, button#cancel:hover { - background-color: #f5b301 !important; + background-color: #ffdb7a !important; color: #000000; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); @@ -2503,7 +2503,7 @@ button#cancel:hover { } button[id="cancel"]:active, button#cancel:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; color: #000000; -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -2537,13 +2537,13 @@ button#cancel:active { height: 24px; } #passwordcancel:hover { - background-color: #f5b301 !important; + background-color: #ffdb7a !important; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); } #passwordcancel:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -2600,7 +2600,7 @@ button[id="add"] { height: 24px; } button[id="add"]:active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } /*Button Ende #######################################################*/ /** @@ -2949,35 +2949,34 @@ table.table_passord_change td:first-child { * @package pixelegg * @version $Id: layout_table.less 3089 2014-06-11 14:02:57Z pixelegg $ */ -/*dhtml Submenu ##########################################################*/ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item td.sub_item_icon { /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ } -div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item td.sub_item_icon img[src*="svg"] { - background-color: #000000; - background-color: #1e1e1e; - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMUUxRTFFIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMUUxRTFFIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); - background-image: -moz-linear-gradient(top, #1E1E1E, #1E1E1E); - background-image: -ms-linear-gradient(top, #1E1E1E, #1E1E1E); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#1E1E1E), to(#1E1E1E)); - background-image: -webkit-linear-gradient(top, #1E1E1E, #1E1E1E); - background-image: -o-linear-gradient(top, #1E1E1E, #1E1E1E); - background-image: linear-gradient(top, #1E1E1E, #1E1E1E); - background-repeat: repeat-x; -} div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected { background-color: #ffc200 !important; background-image: none !important; } +div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected td.sub_item_icon { + /*filter grey*/ + filter: url("data:image/svg+xml;utf8,#grayscale"); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + /*filter: url(grayscale.svg); Firefox 4+ */ + filter: gray; + /* IE 6-9 */ +} /** * EGroupware: Stylite Pixelegg template * @@ -3212,11 +3211,11 @@ td.etemplate_tab_active.th { /*filter grey*/ /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -3604,7 +3603,7 @@ td.lettersearch { } #egwpopup input#egwpopup_ok_button:active, #egwpopup button#desktop_perms:active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } #egwpopup #egwpopup_list::-webkit-scrollbar-track { -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); @@ -4151,7 +4150,7 @@ td.message span.message { } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home { margin-left: 0px; - background-image: url(../images/topmenu_items/home.png); + background-image: url(../images/topmenu_items/home.svg); background-repeat: no-repeat; background-size: 16px; padding-left: 20px; @@ -4161,43 +4160,43 @@ td.message span.message { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/setup.png); + background-image: url(../images/topmenu_items/setup.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_acl { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/access.png); + background-image: url(../images/topmenu_items/access.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_cats { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/category.png); + background-image: url(../images/topmenu_items/category.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_password { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/password.png); + background-image: url(../images/topmenu_items/password.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_manual { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/help.png); + background-image: url(../images/topmenu_items/help.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_search { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/search.png); + background-image: url(../images/topmenu_items/search.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_logout { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/logout.png); + background-image: url(../images/topmenu_items/logout.svg); } /* ################################################### Slide Effekt @@ -4365,11 +4364,11 @@ td.message span.message { margin: 5px 1px 0 1em; /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -4773,11 +4772,11 @@ td.message span.message { /*filter grey*/ /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -5451,11 +5450,11 @@ div#topmenu_info_update img { .standartTreeImage { /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -6757,11 +6756,11 @@ span.egw_tutorial_title { margin: 5px 1px 0 1em; /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -7084,11 +7083,11 @@ span.egw_tutorial_title { /*filter grey*/ /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ diff --git a/pixelegg/css/monochrome.css b/pixelegg/css/monochrome.css index 5ca990aaf5..c690632a2b 100644 --- a/pixelegg/css/monochrome.css +++ b/pixelegg/css/monochrome.css @@ -60,11 +60,11 @@ table.egwGridView_grid img.et2_appicon { /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -163,14 +163,14 @@ background-repeat: repeat-x; } img.et2_button_icon[src*="svg"]:hover { - background-color: #1aa200; - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMWFhMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMWFhMjAwIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); - background-image: -moz-linear-gradient(top, #1aa200, #1aa200); - background-image: -ms-linear-gradient(top, #1aa200, #1aa200); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#1aa200), to(#1aa200)); - background-image: -webkit-linear-gradient(top, #1aa200, #1aa200); - background-image: -o-linear-gradient(top, #1aa200, #1aa200); - background-image: linear-gradient(top, #1aa200, #1aa200); + background-color: #b3e4a6; + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjNlNGE2IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjNlNGE2IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); + background-image: -moz-linear-gradient(top, #b3e4a6, #b3e4a6); + background-image: -ms-linear-gradient(top, #b3e4a6, #b3e4a6); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b3e4a6), to(#b3e4a6)); + background-image: -webkit-linear-gradient(top, #b3e4a6, #b3e4a6); + background-image: -o-linear-gradient(top, #b3e4a6, #b3e4a6); + background-image: linear-gradient(top, #b3e4a6, #b3e4a6); background-repeat: repeat-x; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); @@ -253,14 +253,14 @@ fill: red !important; } span.et2_file_span:hover { - background-color: #189800 !important; + background-color: #ace29e !important; color: #000000 !important; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; } span.et2_file_span:active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } div.et2_file input.et2_file_upload { background-color: #FFFFFF !important; @@ -277,7 +277,7 @@ -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } /* Gantt widget */ .et2_gantt .gantt_task_line { @@ -647,7 +647,7 @@ -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); - background-color: #1aa200; + background-color: #b3e4a6; } /*################################################################ * @@ -724,7 +724,7 @@ } .et2_dropdown button.ui-corner-left:active, .et2_dropdown button.ui-state-default:active { - background-color: #1aa200; + background-color: #b3e4a6; } .et2_dropdown button.ui-state-hover { background-color: #E6E6E6; @@ -1242,7 +1242,7 @@ option:checked { background-color: transparent; } .ui-icon-close:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; } span.ui-icon-close { margin-top: 0px; @@ -1273,7 +1273,7 @@ span.ui-icon-close { -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important; -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important; box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important; - background-color: #fecc44 !important; + background-color: #fff0c7 !important; } /*###########################################*/ /*Menu */ @@ -1511,20 +1511,20 @@ div#ui-datepicker-div { background-color: #679FD2; } .ui-datepicker button.ui-datepicker-current .ui-state-hover { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } .ui-datepicker button.ui-datepicker-current .ui-state-hover:active { - background-color: #1aa200; + background-color: #b3e4a6; } .ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current:active { - background-color: #1aa200; + background-color: #b3e4a6; } .ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-close:hover { - background-color: #f5b301 !important; + background-color: #ffdb7a !important; color: #000000; } .ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-close:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; color: #373737; } .ui-widget-overlay, @@ -2149,7 +2149,7 @@ input[type=button]:hover { -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); - background-color: #1aa200; + background-color: #b3e4a6; background-size: 16px 16px; } button.et2_button_text:active, @@ -2261,7 +2261,7 @@ button[id="calendar-edit_button[delete]"]:hover, button[id="timesheet-edit_button[delete]"]:hover, button[id="displayToolbar-delete"]:hover, button.et2_button_delete:hover { - background-color: #b81f00 !important; + background-color: #ff8f78 !important; /*.border_normal;*/ /*.box_shadow_standard_light;*/ /*.rounded (3px);*/ @@ -2298,7 +2298,7 @@ button[id="calendar-edit_button[delete]"]:active, button[id="timesheet-edit_button[delete]"]:active, button[id="displayToolbar-delete"]:active, button.et2_button_delete:active { - background-color: #e12500 !important; + background-color: #ffb1a1 !important; /*.border_normal;*/ /*.box_shadow_standard_light;*/ /*.rounded (3px);*/ @@ -2351,7 +2351,7 @@ button[id*="apply"]:hover, button[id*="copy"]:hover, button[id*="edit_button[edit]"]:hover, button.et2_button:hover { - background-color: #189800; + background-color: #ace29e; color: #000000; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); @@ -2362,7 +2362,7 @@ button[id*="apply"]:active, button[id*="copy"]:active, button[id*="edit_button[edit]"]:active, button.et2_button:active { - background-color: #1aa200; + background-color: #b3e4a6; } button[id*="add"]:not([id*='addressbook']) img[url*="svg"] { background-color: #b4b4b4 !important; @@ -2377,17 +2377,17 @@ button[id*="add"]:not([id*='addressbook']) img[url*="svg"] { fill: red !important; } button[id*="add"]:not([id*='addressbook']):hover { - background-color: #189800 !important; + background-color: #ace29e !important; color: #000000 !important; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; } button[id*="add"]:not([id*='addressbook']):active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } button#filemanager-select_button[ok]:active { - background-color: #1aa200; + background-color: #b3e4a6; } #passwordchange { background-image: url('../images/cancel.png') !important; @@ -2417,13 +2417,13 @@ button#filemanager-select_button[ok]:active { height: 24px; } #passwordchange:hover { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); } #passwordchange:active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -2439,7 +2439,7 @@ button#cancel:hover, #cancel:hover, button.et2_button_cancel:hover, button.et2_button_question:hover { - background-color: #f5b301 !important; + background-color: #ffdb7a !important; color: #000000; } button[id*="cancel"]:active, @@ -2448,7 +2448,7 @@ button#cancel:active, #cancel:active, button.et2_button_cancel:active, button.et2_button_question:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; color: #373737; } /* et2_box_widget ###*/ @@ -2484,7 +2484,7 @@ button#cancel { } button[id="cancel"]:hover, button#cancel:hover { - background-color: #f5b301 !important; + background-color: #ffdb7a !important; color: #000000; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); @@ -2492,7 +2492,7 @@ button#cancel:hover { } button[id="cancel"]:active, button#cancel:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; color: #000000; -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -2526,13 +2526,13 @@ button#cancel:active { height: 24px; } #passwordcancel:hover { - background-color: #f5b301 !important; + background-color: #ffdb7a !important; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); } #passwordcancel:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -2589,7 +2589,7 @@ button[id="add"] { height: 24px; } button[id="add"]:active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } /*Button Ende #######################################################*/ /** @@ -2938,35 +2938,34 @@ table.table_passord_change td:first-child { * @package pixelegg * @version $Id: layout_table.less 3089 2014-06-11 14:02:57Z pixelegg $ */ -/*dhtml Submenu ##########################################################*/ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item td.sub_item_icon { /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ } -div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item td.sub_item_icon img[src*="svg"] { - background-color: #000000; - background-color: #1e1e1e; - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMUUxRTFFIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMUUxRTFFIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); - background-image: -moz-linear-gradient(top, #1E1E1E, #1E1E1E); - background-image: -ms-linear-gradient(top, #1E1E1E, #1E1E1E); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#1E1E1E), to(#1E1E1E)); - background-image: -webkit-linear-gradient(top, #1E1E1E, #1E1E1E); - background-image: -o-linear-gradient(top, #1E1E1E, #1E1E1E); - background-image: linear-gradient(top, #1E1E1E, #1E1E1E); - background-repeat: repeat-x; -} div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected { background-color: #ffc200 !important; background-image: none !important; } +div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected td.sub_item_icon { + /*filter grey*/ + filter: url("data:image/svg+xml;utf8,#grayscale"); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + /*filter: url(grayscale.svg); Firefox 4+ */ + filter: gray; + /* IE 6-9 */ +} /** * EGroupware: Stylite Pixelegg template * @@ -3201,11 +3200,11 @@ td.etemplate_tab_active.th { /*filter grey*/ /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -3593,7 +3592,7 @@ td.lettersearch { } #egwpopup input#egwpopup_ok_button:active, #egwpopup button#desktop_perms:active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } #egwpopup #egwpopup_list::-webkit-scrollbar-track { -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); @@ -4140,7 +4139,7 @@ td.message span.message { } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home { margin-left: 0px; - background-image: url(../images/topmenu_items/home.png); + background-image: url(../images/topmenu_items/home.svg); background-repeat: no-repeat; background-size: 16px; padding-left: 20px; @@ -4150,43 +4149,43 @@ td.message span.message { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/setup.png); + background-image: url(../images/topmenu_items/setup.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_acl { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/access.png); + background-image: url(../images/topmenu_items/access.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_cats { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/category.png); + background-image: url(../images/topmenu_items/category.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_password { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/password.png); + background-image: url(../images/topmenu_items/password.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_manual { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/help.png); + background-image: url(../images/topmenu_items/help.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_search { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/search.png); + background-image: url(../images/topmenu_items/search.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_logout { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/logout.png); + background-image: url(../images/topmenu_items/logout.svg); } /* ################################################### Slide Effekt @@ -4354,11 +4353,11 @@ td.message span.message { margin: 5px 1px 0 1em; /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -4762,11 +4761,11 @@ td.message span.message { /*filter grey*/ /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -5440,11 +5439,11 @@ div#topmenu_info_update img { .standartTreeImage { /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ diff --git a/pixelegg/css/monochrome.less b/pixelegg/css/monochrome.less index 070fb5dd91..27e2830ef1 100644 --- a/pixelegg/css/monochrome.less +++ b/pixelegg/css/monochrome.less @@ -50,4 +50,4 @@ // // -// \ No newline at end of file +// diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index 9bfb985bb6..0d204f985e 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -71,11 +71,11 @@ table.egwGridView_grid img.et2_appicon { /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -174,14 +174,14 @@ background-repeat: repeat-x; } img.et2_button_icon[src*="svg"]:hover { - background-color: #1aa200; - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMWFhMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMWFhMjAwIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); - background-image: -moz-linear-gradient(top, #1aa200, #1aa200); - background-image: -ms-linear-gradient(top, #1aa200, #1aa200); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#1aa200), to(#1aa200)); - background-image: -webkit-linear-gradient(top, #1aa200, #1aa200); - background-image: -o-linear-gradient(top, #1aa200, #1aa200); - background-image: linear-gradient(top, #1aa200, #1aa200); + background-color: #b3e4a6; + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjNlNGE2IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjNlNGE2IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); + background-image: -moz-linear-gradient(top, #b3e4a6, #b3e4a6); + background-image: -ms-linear-gradient(top, #b3e4a6, #b3e4a6); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b3e4a6), to(#b3e4a6)); + background-image: -webkit-linear-gradient(top, #b3e4a6, #b3e4a6); + background-image: -o-linear-gradient(top, #b3e4a6, #b3e4a6); + background-image: linear-gradient(top, #b3e4a6, #b3e4a6); background-repeat: repeat-x; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); @@ -264,14 +264,14 @@ fill: red !important; } span.et2_file_span:hover { - background-color: #189800 !important; + background-color: #ace29e !important; color: #000000 !important; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; } span.et2_file_span:active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } div.et2_file input.et2_file_upload { background-color: #FFFFFF !important; @@ -288,7 +288,7 @@ -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } /* Gantt widget */ .et2_gantt .gantt_task_line { @@ -658,7 +658,7 @@ -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); - background-color: #1aa200; + background-color: #b3e4a6; } /*################################################################ * @@ -735,7 +735,7 @@ } .et2_dropdown button.ui-corner-left:active, .et2_dropdown button.ui-state-default:active { - background-color: #1aa200; + background-color: #b3e4a6; } .et2_dropdown button.ui-state-hover { background-color: #E6E6E6; @@ -1253,7 +1253,7 @@ option:checked { background-color: transparent; } .ui-icon-close:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; } span.ui-icon-close { margin-top: 0px; @@ -1284,7 +1284,7 @@ span.ui-icon-close { -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important; -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important; box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important; - background-color: #fecc44 !important; + background-color: #fff0c7 !important; } /*###########################################*/ /*Menu */ @@ -1522,20 +1522,20 @@ div#ui-datepicker-div { background-color: #679FD2; } .ui-datepicker button.ui-datepicker-current .ui-state-hover { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } .ui-datepicker button.ui-datepicker-current .ui-state-hover:active { - background-color: #1aa200; + background-color: #b3e4a6; } .ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current:active { - background-color: #1aa200; + background-color: #b3e4a6; } .ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-close:hover { - background-color: #f5b301 !important; + background-color: #ffdb7a !important; color: #000000; } .ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-close:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; color: #373737; } .ui-widget-overlay, @@ -2160,7 +2160,7 @@ input[type=button]:hover { -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); - background-color: #1aa200; + background-color: #b3e4a6; background-size: 16px 16px; } button.et2_button_text:active, @@ -2272,7 +2272,7 @@ button[id="calendar-edit_button[delete]"]:hover, button[id="timesheet-edit_button[delete]"]:hover, button[id="displayToolbar-delete"]:hover, button.et2_button_delete:hover { - background-color: #b81f00 !important; + background-color: #ff8f78 !important; /*.border_normal;*/ /*.box_shadow_standard_light;*/ /*.rounded (3px);*/ @@ -2309,7 +2309,7 @@ button[id="calendar-edit_button[delete]"]:active, button[id="timesheet-edit_button[delete]"]:active, button[id="displayToolbar-delete"]:active, button.et2_button_delete:active { - background-color: #e12500 !important; + background-color: #ffb1a1 !important; /*.border_normal;*/ /*.box_shadow_standard_light;*/ /*.rounded (3px);*/ @@ -2362,7 +2362,7 @@ button[id*="apply"]:hover, button[id*="copy"]:hover, button[id*="edit_button[edit]"]:hover, button.et2_button:hover { - background-color: #189800; + background-color: #ace29e; color: #000000; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); @@ -2373,7 +2373,7 @@ button[id*="apply"]:active, button[id*="copy"]:active, button[id*="edit_button[edit]"]:active, button.et2_button:active { - background-color: #1aa200; + background-color: #b3e4a6; } button[id*="add"]:not([id*='addressbook']) img[url*="svg"] { background-color: #b4b4b4 !important; @@ -2388,17 +2388,17 @@ button[id*="add"]:not([id*='addressbook']) img[url*="svg"] { fill: red !important; } button[id*="add"]:not([id*='addressbook']):hover { - background-color: #189800 !important; + background-color: #ace29e !important; color: #000000 !important; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; } button[id*="add"]:not([id*='addressbook']):active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } button#filemanager-select_button[ok]:active { - background-color: #1aa200; + background-color: #b3e4a6; } #passwordchange { background-image: url('../images/cancel.png') !important; @@ -2428,13 +2428,13 @@ button#filemanager-select_button[ok]:active { height: 24px; } #passwordchange:hover { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); } #passwordchange:active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -2450,7 +2450,7 @@ button#cancel:hover, #cancel:hover, button.et2_button_cancel:hover, button.et2_button_question:hover { - background-color: #f5b301 !important; + background-color: #ffdb7a !important; color: #000000; } button[id*="cancel"]:active, @@ -2459,7 +2459,7 @@ button#cancel:active, #cancel:active, button.et2_button_cancel:active, button.et2_button_question:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; color: #373737; } /* et2_box_widget ###*/ @@ -2495,7 +2495,7 @@ button#cancel { } button[id="cancel"]:hover, button#cancel:hover { - background-color: #f5b301 !important; + background-color: #ffdb7a !important; color: #000000; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); @@ -2503,7 +2503,7 @@ button#cancel:hover { } button[id="cancel"]:active, button#cancel:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; color: #000000; -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -2537,13 +2537,13 @@ button#cancel:active { height: 24px; } #passwordcancel:hover { - background-color: #f5b301 !important; + background-color: #ffdb7a !important; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); } #passwordcancel:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -2600,7 +2600,7 @@ button[id="add"] { height: 24px; } button[id="add"]:active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } /*Button Ende #######################################################*/ /** @@ -2949,35 +2949,34 @@ table.table_passord_change td:first-child { * @package pixelegg * @version $Id: layout_table.less 3089 2014-06-11 14:02:57Z pixelegg $ */ -/*dhtml Submenu ##########################################################*/ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item td.sub_item_icon { /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ } -div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item td.sub_item_icon img[src*="svg"] { - background-color: #000000; - background-color: #1e1e1e; - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMUUxRTFFIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMUUxRTFFIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); - background-image: -moz-linear-gradient(top, #1E1E1E, #1E1E1E); - background-image: -ms-linear-gradient(top, #1E1E1E, #1E1E1E); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#1E1E1E), to(#1E1E1E)); - background-image: -webkit-linear-gradient(top, #1E1E1E, #1E1E1E); - background-image: -o-linear-gradient(top, #1E1E1E, #1E1E1E); - background-image: linear-gradient(top, #1E1E1E, #1E1E1E); - background-repeat: repeat-x; -} div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected { background-color: #ffc200 !important; background-image: none !important; } +div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected td.sub_item_icon { + /*filter grey*/ + filter: url("data:image/svg+xml;utf8,#grayscale"); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + /*filter: url(grayscale.svg); Firefox 4+ */ + filter: gray; + /* IE 6-9 */ +} /** * EGroupware: Stylite Pixelegg template * @@ -3212,11 +3211,11 @@ td.etemplate_tab_active.th { /*filter grey*/ /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -3604,7 +3603,7 @@ td.lettersearch { } #egwpopup input#egwpopup_ok_button:active, #egwpopup button#desktop_perms:active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } #egwpopup #egwpopup_list::-webkit-scrollbar-track { -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); @@ -4151,7 +4150,7 @@ td.message span.message { } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home { margin-left: 0px; - background-image: url(../images/topmenu_items/home.png); + background-image: url(../images/topmenu_items/home.svg); background-repeat: no-repeat; background-size: 16px; padding-left: 20px; @@ -4161,43 +4160,43 @@ td.message span.message { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/setup.png); + background-image: url(../images/topmenu_items/setup.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_acl { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/access.png); + background-image: url(../images/topmenu_items/access.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_cats { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/category.png); + background-image: url(../images/topmenu_items/category.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_password { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/password.png); + background-image: url(../images/topmenu_items/password.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_manual { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/help.png); + background-image: url(../images/topmenu_items/help.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_search { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/search.png); + background-image: url(../images/topmenu_items/search.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_logout { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/logout.png); + background-image: url(../images/topmenu_items/logout.svg); } /* ################################################### Slide Effekt @@ -4365,11 +4364,11 @@ td.message span.message { margin: 5px 1px 0 1em; /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -4773,11 +4772,11 @@ td.message span.message { /*filter grey*/ /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -5451,11 +5450,11 @@ div#topmenu_info_update img { .standartTreeImage { /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ diff --git a/pixelegg/images/apply.svg b/pixelegg/images/apply.svg index 79e03d5091..cf074a06ae 100644 --- a/pixelegg/images/apply.svg +++ b/pixelegg/images/apply.svg @@ -1,12 +1,12 @@ - + - diff --git a/pixelegg/images/cancel.svg b/pixelegg/images/cancel.svg index 65515149ee..71aaa6f252 100644 --- a/pixelegg/images/cancel.svg +++ b/pixelegg/images/cancel.svg @@ -1,12 +1,12 @@ - + - diff --git a/pixelegg/images/save.svg b/pixelegg/images/save.svg index 5281daf88e..f610b4431f 100644 --- a/pixelegg/images/save.svg +++ b/pixelegg/images/save.svg @@ -1,12 +1,12 @@ - + - #grayscale"); - - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); - /*filter: url(grayscale.svg); Firefox 4+ */ - filter: gray; /* IE 6-9 */ - + /*filter grey*/ + filter: url("data:image/svg+xml;utf8,#grayscale"); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + /*filter: url(grayscale.svg); Firefox 4+ */ + filter: gray; /* IE 6-9 */ } diff --git a/pixelegg/less/layout_dhtmlSubmenu.less b/pixelegg/less/layout_dhtmlSubmenu.less index ff75011665..f3261e7614 100644 --- a/pixelegg/less/layout_dhtmlSubmenu.less +++ b/pixelegg/less/layout_dhtmlSubmenu.less @@ -12,25 +12,20 @@ * @version $Id: layout_table.less 3089 2014-06-11 14:02:57Z pixelegg $ */ @import (reference) "definitions.less"; -//############################################################################################################## -/*dhtml Submenu ##########################################################*/ div.dhtmlxMenu_egw_SubLevelArea_Polygon{ - table.dhtmlxMebu_SubLevelArea_Tbl{ - tr.sub_item { - - - td.sub_item_icon{ - img[src*="svg"]{background-color: @gray_100; .gradient_vertical (@gray_90, @gray_90);} - .img_filter_gray; - } - } - - tr.sub_item_selected { - background-color: @egw_color_1_a !important; - background-image: none !important;} - } - + td.sub_item_icon { + .img_filter_gray; + } + } + tr.sub_item_selected { + td.sub_item_icon { + .img_filter_gray; + } + background-color: @egw_color_1_a !important; + background-image: none !important; + } + } } diff --git a/pixelegg/less/layout_raster_header.less b/pixelegg/less/layout_raster_header.less index f496c16d78..c86fae9d33 100644 --- a/pixelegg/less/layout_raster_header.less +++ b/pixelegg/less/layout_raster_header.less @@ -114,7 +114,7 @@ /*home*/ a#topmenu_home { margin-left: 0px; - background-image: url(../images/topmenu_items/home.png); + background-image: url(../images/topmenu_items/home.svg); background-repeat: no-repeat; background-size:16px; padding-left: 20px; @@ -127,7 +127,7 @@ background-repeat: no-repeat; background-size:16px; padding-left: 20px; - background-image: url(../images/topmenu_items/setup.png); + background-image: url(../images/topmenu_items/setup.svg); } /*access / Zugriff */ @@ -135,42 +135,42 @@ background-repeat: no-repeat; background-size:16px; padding-left: 20px; - background-image: url(../images/topmenu_items/access.png); + background-image: url(../images/topmenu_items/access.svg); } /*category*/ a#topmenu_cats{ background-repeat: no-repeat; background-size:16px; padding-left: 20px; - background-image: url(../images/topmenu_items/category.png); + background-image: url(../images/topmenu_items/category.svg); } /*password*/ a#topmenu_password{ background-repeat: no-repeat; background-size:16px; padding-left: 20px; - background-image: url(../images/topmenu_items/password.png); + background-image: url(../images/topmenu_items/password.svg); } /*help*/ a#topmenu_manual{ background-repeat: no-repeat; background-size:16px; padding-left: 20px; - background-image: url(../images/topmenu_items/help.png); + background-image: url(../images/topmenu_items/help.svg); } /*Search*/ a#topmenu_search{ background-repeat: no-repeat; background-size:16px; padding-left: 20px; - background-image: url(../images/topmenu_items/search.png); + background-image: url(../images/topmenu_items/search.svg); } /*logout*/ a#topmenu_logout{ background-repeat: no-repeat; background-size:16px; padding-left: 20px; - background-image: url(../images/topmenu_items/logout.png); + background-image: url(../images/topmenu_items/logout.svg); } } // Ende ul } // Ende Items diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css index 444f896652..4ae2c07e57 100644 --- a/pixelegg/mobile/fw_mobile.css +++ b/pixelegg/mobile/fw_mobile.css @@ -82,11 +82,11 @@ table.egwGridView_grid img.et2_appicon { /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -185,14 +185,14 @@ background-repeat: repeat-x; } img.et2_button_icon[src*="svg"]:hover { - background-color: #1aa200; - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMWFhMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMWFhMjAwIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); - background-image: -moz-linear-gradient(top, #1aa200, #1aa200); - background-image: -ms-linear-gradient(top, #1aa200, #1aa200); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#1aa200), to(#1aa200)); - background-image: -webkit-linear-gradient(top, #1aa200, #1aa200); - background-image: -o-linear-gradient(top, #1aa200, #1aa200); - background-image: linear-gradient(top, #1aa200, #1aa200); + background-color: #b3e4a6; + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjNlNGE2IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjNlNGE2IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); + background-image: -moz-linear-gradient(top, #b3e4a6, #b3e4a6); + background-image: -ms-linear-gradient(top, #b3e4a6, #b3e4a6); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b3e4a6), to(#b3e4a6)); + background-image: -webkit-linear-gradient(top, #b3e4a6, #b3e4a6); + background-image: -o-linear-gradient(top, #b3e4a6, #b3e4a6); + background-image: linear-gradient(top, #b3e4a6, #b3e4a6); background-repeat: repeat-x; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); @@ -275,14 +275,14 @@ fill: red !important; } span.et2_file_span:hover { - background-color: #189800 !important; + background-color: #ace29e !important; color: #000000 !important; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; } span.et2_file_span:active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } div.et2_file input.et2_file_upload { background-color: #FFFFFF !important; @@ -299,7 +299,7 @@ -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } /* Gantt widget */ .et2_gantt .gantt_task_line { @@ -669,7 +669,7 @@ -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); - background-color: #1aa200; + background-color: #b3e4a6; } /*################################################################ * @@ -746,7 +746,7 @@ } .et2_dropdown button.ui-corner-left:active, .et2_dropdown button.ui-state-default:active { - background-color: #1aa200; + background-color: #b3e4a6; } .et2_dropdown button.ui-state-hover { background-color: #E6E6E6; @@ -1264,7 +1264,7 @@ option:checked { background-color: transparent; } .ui-icon-close:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; } span.ui-icon-close { margin-top: 0px; @@ -1295,7 +1295,7 @@ span.ui-icon-close { -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important; -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important; box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5) !important; - background-color: #fecc44 !important; + background-color: #fff0c7 !important; } /*###########################################*/ /*Menu */ @@ -1533,20 +1533,20 @@ div#ui-datepicker-div { background-color: #679FD2; } .ui-datepicker button.ui-datepicker-current .ui-state-hover { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } .ui-datepicker button.ui-datepicker-current .ui-state-hover:active { - background-color: #1aa200; + background-color: #b3e4a6; } .ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current:active { - background-color: #1aa200; + background-color: #b3e4a6; } .ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-close:hover { - background-color: #f5b301 !important; + background-color: #ffdb7a !important; color: #000000; } .ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-close:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; color: #373737; } .ui-widget-overlay, @@ -2171,7 +2171,7 @@ input[type=button]:hover { -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); - background-color: #1aa200; + background-color: #b3e4a6; background-size: 16px 16px; } button.et2_button_text:active, @@ -2283,7 +2283,7 @@ button[id="calendar-edit_button[delete]"]:hover, button[id="timesheet-edit_button[delete]"]:hover, button[id="displayToolbar-delete"]:hover, button.et2_button_delete:hover { - background-color: #b81f00 !important; + background-color: #ff8f78 !important; /*.border_normal;*/ /*.box_shadow_standard_light;*/ /*.rounded (3px);*/ @@ -2320,7 +2320,7 @@ button[id="calendar-edit_button[delete]"]:active, button[id="timesheet-edit_button[delete]"]:active, button[id="displayToolbar-delete"]:active, button.et2_button_delete:active { - background-color: #e12500 !important; + background-color: #ffb1a1 !important; /*.border_normal;*/ /*.box_shadow_standard_light;*/ /*.rounded (3px);*/ @@ -2373,7 +2373,7 @@ button[id*="apply"]:hover, button[id*="copy"]:hover, button[id*="edit_button[edit]"]:hover, button.et2_button:hover { - background-color: #189800; + background-color: #ace29e; color: #000000; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); @@ -2384,7 +2384,7 @@ button[id*="apply"]:active, button[id*="copy"]:active, button[id*="edit_button[edit]"]:active, button.et2_button:active { - background-color: #1aa200; + background-color: #b3e4a6; } button[id*="add"]:not([id*='addressbook']) img[url*="svg"] { background-color: #b4b4b4 !important; @@ -2399,17 +2399,17 @@ button[id*="add"]:not([id*='addressbook']) img[url*="svg"] { fill: red !important; } button[id*="add"]:not([id*='addressbook']):hover { - background-color: #189800 !important; + background-color: #ace29e !important; color: #000000 !important; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important; } button[id*="add"]:not([id*='addressbook']):active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } button#filemanager-select_button[ok]:active { - background-color: #1aa200; + background-color: #b3e4a6; } #passwordchange { background-image: url('../images/cancel.png') !important; @@ -2439,13 +2439,13 @@ button#filemanager-select_button[ok]:active { height: 24px; } #passwordchange:hover { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); } #passwordchange:active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -2461,7 +2461,7 @@ button#cancel:hover, #cancel:hover, button.et2_button_cancel:hover, button.et2_button_question:hover { - background-color: #f5b301 !important; + background-color: #ffdb7a !important; color: #000000; } button[id*="cancel"]:active, @@ -2470,7 +2470,7 @@ button#cancel:active, #cancel:active, button.et2_button_cancel:active, button.et2_button_question:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; color: #373737; } /* et2_box_widget ###*/ @@ -2506,7 +2506,7 @@ button#cancel { } button[id="cancel"]:hover, button#cancel:hover { - background-color: #f5b301 !important; + background-color: #ffdb7a !important; color: #000000; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); @@ -2514,7 +2514,7 @@ button#cancel:hover { } button[id="cancel"]:active, button#cancel:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; color: #000000; -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -2548,13 +2548,13 @@ button#cancel:active { height: 24px; } #passwordcancel:hover { - background-color: #f5b301 !important; + background-color: #ffdb7a !important; -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); } #passwordcancel:active { - background-color: #fecc44 !important; + background-color: #fff0c7 !important; -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -2611,7 +2611,7 @@ button[id="add"] { height: 24px; } button[id="add"]:active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } /*Button Ende #######################################################*/ /** @@ -2960,35 +2960,34 @@ table.table_passord_change td:first-child { * @package pixelegg * @version $Id: layout_table.less 3089 2014-06-11 14:02:57Z pixelegg $ */ -/*dhtml Submenu ##########################################################*/ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item td.sub_item_icon { /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ } -div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item td.sub_item_icon img[src*="svg"] { - background-color: #000000; - background-color: #1e1e1e; - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMUUxRTFFIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMUUxRTFFIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); - background-image: -moz-linear-gradient(top, #1E1E1E, #1E1E1E); - background-image: -ms-linear-gradient(top, #1E1E1E, #1E1E1E); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#1E1E1E), to(#1E1E1E)); - background-image: -webkit-linear-gradient(top, #1E1E1E, #1E1E1E); - background-image: -o-linear-gradient(top, #1E1E1E, #1E1E1E); - background-image: linear-gradient(top, #1E1E1E, #1E1E1E); - background-repeat: repeat-x; -} div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected { background-color: #ffc200 !important; background-image: none !important; } +div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected td.sub_item_icon { + /*filter grey*/ + filter: url("data:image/svg+xml;utf8,#grayscale"); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + /*filter: url(grayscale.svg); Firefox 4+ */ + filter: gray; + /* IE 6-9 */ +} /** * EGroupware: Stylite Pixelegg template * @@ -3223,11 +3222,11 @@ td.etemplate_tab_active.th { /*filter grey*/ /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -3615,7 +3614,7 @@ td.lettersearch { } #egwpopup input#egwpopup_ok_button:active, #egwpopup button#desktop_perms:active { - background-color: #1aa200 !important; + background-color: #b3e4a6 !important; } #egwpopup #egwpopup_list::-webkit-scrollbar-track { -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); @@ -4162,7 +4161,7 @@ td.message span.message { } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home { margin-left: 0px; - background-image: url(../images/topmenu_items/home.png); + background-image: url(../images/topmenu_items/home.svg); background-repeat: no-repeat; background-size: 16px; padding-left: 20px; @@ -4172,43 +4171,43 @@ td.message span.message { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/setup.png); + background-image: url(../images/topmenu_items/setup.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_acl { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/access.png); + background-image: url(../images/topmenu_items/access.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_cats { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/category.png); + background-image: url(../images/topmenu_items/category.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_password { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/password.png); + background-image: url(../images/topmenu_items/password.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_manual { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/help.png); + background-image: url(../images/topmenu_items/help.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_search { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/search.png); + background-image: url(../images/topmenu_items/search.svg); } #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_logout { background-repeat: no-repeat; background-size: 16px; padding-left: 20px; - background-image: url(../images/topmenu_items/logout.png); + background-image: url(../images/topmenu_items/logout.svg); } /* ################################################### Slide Effekt @@ -4376,11 +4375,11 @@ td.message span.message { margin: 5px 1px 0 1em; /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -4784,11 +4783,11 @@ td.message span.message { /*filter grey*/ /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -5462,11 +5461,11 @@ div#topmenu_info_update img { .standartTreeImage { /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -6768,11 +6767,11 @@ span.egw_tutorial_title { margin: 5px 1px 0 1em; /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -7095,11 +7094,11 @@ span.egw_tutorial_title { /*filter grey*/ /*filter grey*/ filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%); - -moz-filter: grayscale(100%); - -ms-filter: grayscale(0%); - -o-filter: grayscale(100%); - filter: grayscale(100%); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */