From 593091f39964dd15e0e6429653b0ba547a70f508 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Feb 2020 15:25:32 +0100 Subject: [PATCH 1/7] FIX etrafield with visibilty=5 were not in read only FIX CSS FIX option for topbar search and bookmarks Conflicts: htdocs/theme/eldy/global.inc.php --- htdocs/core/tpl/extrafields_view.tpl.php | 4 +- htdocs/main.inc.php | 6 ++- htdocs/theme/eldy/dropdown.inc.php | 56 ++++++++++++++++++++++-- htdocs/theme/eldy/global.inc.php | 6 +++ 4 files changed, 65 insertions(+), 7 deletions(-) diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php index f8767a82163..1ef3ef07255 100644 --- a/htdocs/core/tpl/extrafields_view.tpl.php +++ b/htdocs/core/tpl/extrafields_view.tpl.php @@ -73,7 +73,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element] //print $key.'-'.$enabled.'-'.$perms.'-'.$label.$_POST["options_" . $key].'
'."\n"; if (empty($enabled)) continue; // 0 = Never visible field - if (abs($enabled) != 1 && abs($enabled) != 3) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list + if (abs($enabled) != 1 && abs($enabled) != 3 && abs($enabled) != 5) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list if (empty($perms)) continue; // 0 = Not visible // Load language if required @@ -135,7 +135,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element] if ($object->element == 'productlot') $permok = $user->rights->stock->creer; if ($object->element == 'facturerec') $permok = $user->rights->facture->creer; if (($object->statut == 0 || !empty($extrafields->attributes[$object->table_element]['alwayseditable'][$key])) - && $permok && ($action != 'edit_extras' || GETPOST('attribute') != $key) + && $permok && $enabled != 5 && ($action != 'edit_extras' || GETPOST('attribute') != $key) && empty($extrafields->attributes[$object->table_element]['computed'][$key])) { $fieldid = 'id'; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 01a999c6a8b..438dbcda4ec 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -2031,7 +2031,7 @@ function top_menu_search() -
+
'.$dropDownHtml.'
'; @@ -2062,7 +2062,8 @@ function top_menu_search() // close drop down $(document).on("click", function(event) { - if (!$(event.target).closest("#topmenu-global-search-dropdown").length) { + if (!$(event.target).closest("#topmenu-global-search-dropdown").length) { + console.log("click close"); // Hide the menus. $("#topmenu-global-search-dropdown").removeClass("open"); } @@ -2070,6 +2071,7 @@ function top_menu_search() // Open drop down $("#topmenu-global-search-dropdown .dropdown-toggle").on("click", function(event) { + console.log("click open"); openGlobalSearchDropDown(); }); diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php index fb8856d4687..63b7a268440 100644 --- a/htdocs/theme/eldy/dropdown.inc.php +++ b/htdocs/theme/eldy/dropdown.inc.php @@ -5,10 +5,60 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> * Dropdown of user popup */ -.open>.dropdown-menu{ +button.dropdown-item.global-search-item { + outline: none; +} + +.open>.dropdown-search, .open>.dropdown-bookmark, .open>.dropdown-menu{ display: block; } +.dropdown-search { + border-color: #eee; + + position: absolute; + top: 100%; + left: 0; + z-index: 1000; + display: none; + float: left; + min-width: 160px; + margin: 2px 0 0; + font-size: 14px; + text-align: left; + list-style: none; + background-color: #fff; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0,0,0,.15); + border-radius: 4px; + -webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175); + box-shadow: 0 6px 12px rgba(0,0,0,.175); +} +.dropdown-bookmark { + border-color: #eee; + + position: absolute; + top: 100%; + left: 0; + z-index: 1000; + display: none; + float: left; + min-width: 160px; + margin: 2px 0 0; + font-size: 14px; + text-align: left; + list-style: none; + background-color: #fff; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border: 1px solid #ccc; + border: 1px solid rgba(0,0,0,.15); + border-radius: 4px; + -webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175); + box-shadow: 0 6px 12px rgba(0,0,0,.175); +} .dropdown-menu { border-color: #eee; @@ -34,7 +84,6 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> } - .dropdown-toggle{ text-decoration: none !important; } @@ -177,7 +226,8 @@ a.top-menu-dropdown-link { .dropdown-body::-webkit-scrollbar-thumb { -webkit-border-radius: 0; border-radius: 0; - background: rgb(); + /* background: rgb(); */ + background: #aaa; } .dropdown-body::-webkit-scrollbar-track { -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 670734e6706..fa4f751d6a6 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1539,6 +1539,7 @@ div#id-top { background: rgb(); background-image: linear-gradient(-45deg, , rgb()); + /* box-shadow: 0px 0px 5px #eee; */ } @@ -4764,6 +4765,11 @@ div.dataTables_length select { /* Select2 */ /* ============================================================================== */ +.select2-container--default .select2-results__option--highlighted[aria-selected] { + background-color: rgb(); + color: #; +} + .select2-container--focus span.select2-selection.select2-selection--single { border-bottom: 1px solid #666 !important; } From ea19ab96c365fd38d7fc110b51f4ffa520b90046 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 21 Feb 2020 14:41:36 +0100 Subject: [PATCH 2/7] Fix compatibility with php 7.4 --- .../framework/Luracast/Restler/AutoLoader.php | 8 +------- .../framework/Luracast/Restler/CommentParser.php | 12 ++++++------ .../framework/Luracast/Restler/Format/XmlFormat.php | 2 +- .../restler/framework/Luracast/Restler/Resources.php | 6 +++--- .../restler/framework/Luracast/Restler/Restler.php | 4 ++-- .../restler/framework/Luracast/Restler/Routes.php | 6 +++--- .../restler/framework/Luracast/Restler/Scope.php | 2 +- .../restler/framework/Luracast/Restler/UI/Emmet.php | 4 ++-- 8 files changed, 19 insertions(+), 25 deletions(-) diff --git a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php index eff8bb61f29..d8445fdc70c 100644 --- a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php +++ b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php @@ -263,13 +263,7 @@ class AutoLoader * @return bool false unless className now exists */ private function loadLastResort($className, $loader = null) { - // @CHANGE LDR Add protection to avoid conflict with other autoloader - /*print 'Try to load '.$className."\n"; - if (in_array($className, array('Google_Client'))) - { - return false; - }*/ - $loaders = array_unique(static::$rogueLoaders); + $loaders = array_unique(static::$rogueLoaders); if (isset($loader)) { if (false === array_search($loader, $loaders)) static::$rogueLoaders[] = $loader; diff --git a/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php b/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php index e8248a385fa..2815f1f6c70 100644 --- a/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php +++ b/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php @@ -159,7 +159,7 @@ class CommentParser $addNewline = true; } continue; - } elseif ($line{0} == '@') { + } elseif ($line[0] == '@') { $mode = 2; $newParam = true; } @@ -353,7 +353,7 @@ class CommentParser $data = $format->decode($str); } } else { // auto detect - if ($str{0} == '{') { + if ($str[0] == '{') { $d = json_decode($str, true); if (json_last_error() != JSON_ERROR_NONE) { throw new Exception('Error parsing embedded JSON data' @@ -445,7 +445,7 @@ class CommentParser { $r = array(); $email = end($value); - if ($email{0} == '<') { + if ($email[0] == '<') { $email = substr($email, 1, -1); array_pop($value); $r['email'] = $email; @@ -470,7 +470,7 @@ class CommentParser $data = array_shift($value); if (empty($data)) { $r['type'] = 'mixed'; - } elseif ($data{0} == '$') { + } elseif ($data[0] == '$') { $r['name'] = substr($data, 1); $r['type'] = 'mixed'; } else { @@ -478,7 +478,7 @@ class CommentParser $r['type'] = count($data) == 1 ? $data[0] : $data; $data = array_shift($value); - if (!empty($data) && $data{0} == '$') { + if (!empty($data) && $data[0] == '$') { $r['name'] = substr($data, 1); } } @@ -498,7 +498,7 @@ class CommentParser $data = array_shift($value); if (empty($data)) { $r['type'] = 'mixed'; - } elseif ($data{0} == '$') { + } elseif ($data[0] == '$') { $r['name'] = substr($data, 1); $r['type'] = 'mixed'; } else { diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php index b51fa707a53..ceec32e4cb5 100644 --- a/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php +++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php @@ -221,7 +221,7 @@ class XmlFormat extends Format $namespaces = $xml->getNamespaces(); if (count($namespaces)) { $p = strpos($data, $xml->getName()); - if ($p && $data{$p - 1} == ':') { + if ($p && $data[$p - 1] == ':') { $s = strpos($data, '<') + 1; $prefix = substr($data, $s, $p - $s - 1); static::$namespacedProperties[static::$rootName] = $prefix; diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Resources.php b/htdocs/includes/restler/framework/Luracast/Restler/Resources.php index 43e95fa02be..2986968a990 100644 --- a/htdocs/includes/restler/framework/Luracast/Restler/Resources.php +++ b/htdocs/includes/restler/framework/Luracast/Restler/Resources.php @@ -198,7 +198,7 @@ class Resources implements iUseAuthentication, iProvideMultiVersionApi } elseif (false !== ($pos = strpos($id, '-v'))) { //$version = intval(substr($id, $pos + 2)); $id = substr($id, 0, $pos); - } elseif ($id{0} == 'v' && is_numeric($v = substr($id, 1))) { + } elseif ($id[0] == 'v' && is_numeric($v = substr($id, 1))) { $id = ''; //$version = $v; } elseif ($id == 'root' || $id == 'index') { @@ -233,7 +233,7 @@ class Resources implements iUseAuthentication, iProvideMultiVersionApi if ($tSlash) { if ($fLen != $tLen && !Text::beginsWith($fullPath, $target . '/')) continue; - } elseif ($fLen > $tLen + 1 && $fullPath{$tLen + 1} != '{' && !Text::beginsWith($fullPath, '{')) { + } elseif ($fLen > $tLen + 1 && $fullPath[$tLen + 1] != '{' && !Text::beginsWith($fullPath, '{')) { //when mapped to root exclude paths that have static parts //they are listed else where under that static part name continue; @@ -275,7 +275,7 @@ class Resources implements iUseAuthentication, iProvideMultiVersionApi if (count($parts) == 1 && $httpMethod == 'GET') { } else { for ($i = 0; $i < count($parts); $i++) { - if (strlen($parts[$i]) && $parts[$i]{0} == '{') { + if (strlen($parts[$i]) && $parts[$i][0] == '{') { $pos = $i - 1; break; } diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Restler.php b/htdocs/includes/restler/framework/Luracast/Restler/Restler.php index c2e9b1acb73..fcb5388726c 100644 --- a/htdocs/includes/restler/framework/Luracast/Restler/Restler.php +++ b/htdocs/includes/restler/framework/Luracast/Restler/Restler.php @@ -533,7 +533,7 @@ class Restler extends EventDispatcher rtrim($path, '/') //remove trailing slash if found ); - if (Defaults::$useUrlBasedVersioning && strlen($path) && $path{0} == 'v') { + if (Defaults::$useUrlBasedVersioning && strlen($path) && $path[0] == 'v') { $version = intval(substr($path, 1)); if ($version && $version <= $this->apiVersion) { $this->requestedApiVersion = $version; @@ -1599,7 +1599,7 @@ class Restler extends EventDispatcher */ public function __get($name) { - if ($name{0} == '_') { + if ($name[0] == '_') { $hiddenProperty = substr($name, 1); if (isset($this->$hiddenProperty)) { return $this->$hiddenProperty; diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Routes.php b/htdocs/includes/restler/framework/Luracast/Restler/Routes.php index 73e78dc0039..999094dec4c 100644 --- a/htdocs/includes/restler/framework/Luracast/Restler/Routes.php +++ b/htdocs/includes/restler/framework/Luracast/Restler/Routes.php @@ -87,7 +87,7 @@ class Routes foreach ($methods as $method) { $methodUrl = strtolower($method->getName()); //method name should not begin with _ - if ($methodUrl{0} == '_') { + if ($methodUrl[0] == '_') { continue; } $doc = $method->getDocComment(); @@ -330,7 +330,7 @@ class Routes if (!$type) { return 's'; } - switch ($type{0}) { + switch ($type[0]) { case 'i': case 'f': return 'n'; @@ -428,7 +428,7 @@ class Routes } $index = intval(substr($k, 1)); $details = $value[$httpMethod]['metadata']['param'][$index]; - if ($k{0} == 's' || strpos($k, static::pathVarTypeOf($v)) === 0) { + if ($k[0] == 's' || strpos($k, static::pathVarTypeOf($v)) === 0) { //remove the newlines $data[$details['name']] = trim($v, PHP_EOL); } else { diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Scope.php b/htdocs/includes/restler/framework/Luracast/Restler/Scope.php index 251262017c3..16ccdd33561 100644 --- a/htdocs/includes/restler/framework/Luracast/Restler/Scope.php +++ b/htdocs/includes/restler/framework/Luracast/Restler/Scope.php @@ -203,7 +203,7 @@ class Scope $divider = '\\'; $qualified = false; - if ($className{0} == $divider) { + if ($className[0] == $divider) { $qualified = trim($className, $divider); } elseif (array_key_exists($className, $scope)) { $qualified = $scope[$className]; diff --git a/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php b/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php index abd4a3a73ba..435804b4469 100644 --- a/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php +++ b/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php @@ -356,7 +356,7 @@ class Emmet $pos = strpos($string, $f, $start); $tokens = array(); for ($i = $start; $i < $pos; $i++) { - $token = $string{$i}; + $token = $string[$i]; if (('#' == $token || '.' == $token) && (!empty($tokens) || $i == 0) ) { @@ -368,7 +368,7 @@ class Emmet $r[] = $f; } while (false != ($f = strtok(static::DELIMITERS))); for ($i = $pos; $i < strlen($string); $i++) { - $token = $string{$i}; + $token = $string[$i]; $r[] = $tokens[] = $token; } return $r; From 60f394a53c33d194826d61b3ef9c80f3a5c3ccd5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 21 Feb 2020 17:07:22 +0100 Subject: [PATCH 3/7] Fix CSS for RTL languages --- htdocs/theme/eldy/global.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index fa4f751d6a6..2eebcb19a6b 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1297,7 +1297,7 @@ div.fichetwothirdright { browser->layout == 'phone') { print "padding-bottom: 6px\n"; } ?> } div.fichetwothirdright div.ficheaddleft { - padding-left: 20px; + padding-: 20px; } div.fichehalfleft { browser->layout != 'phone') { print "float: ".$left.";\n"; } ?> From 501728ce364461bc14025550cff221cfa3c206f7 Mon Sep 17 00:00:00 2001 From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com> Date: Fri, 21 Feb 2020 17:31:53 +0100 Subject: [PATCH 4/7] AD --- htdocs/theme/eldy/global.inc.php | 371 ++++++++++++++++++++----------- 1 file changed, 237 insertions(+), 134 deletions(-) diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 2eebcb19a6b..a7f0dd936bd 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -5,14 +5,96 @@ /* Default styles */ /* ============================================================================== */ + :root { + + --colorbackhmenu1: rgb(); + --colorbackvmenu1: rgb(); + --colorbacktitle1: rgb(); + --colorbacktabcard1: rgb(); + --colorbacktabactive: rgb(); + --colorbacklineimpair1: rgb(); + --colorbacklineimpair2: rgb(); + --colorbacklinepair1: rgb(); + --colorbacklinepair2: rgb(); + --colorbacklinepairhover: rgb(); + --colorbacklinepairchecked: rgb(); + --colorbackbody: rgb(); + --colortexttitlenotab: rgb(); + --colortexttitle: rgb(); + --colortext: rgb(); + --colortextlink: rgb(); + --colortextbackhmenu: #; + --colortextbackvmenu: #) ; + --listetotal: #551188; + --inputbackgroundcolor: #FFF; + --inputbordercolor: rgba(0,0,0,.2); + --tooltipbgcolor: ; + --tooltipfontcolor : ; + --oddevencolor: #202020; + --colorboxstatsborder: #ddd; + --dolgraphbg: rgba(255,255,255,0); + --fieldrequiredcolor: #000055; + --colortextbacktab: #) ; + --colorboxiconbg: #eee; + --refidnocolor:#444; + --tableforfieldcolor:#666; + --amountremaintopaycolor:#880000; + --amountpaymentcomplete:#008800; + --amountremaintopaybackcolor:none; + + } +global->MAIN_THEME_DARKMODEENABLED)) { + + print "@media (prefers-color-scheme: dark) { + :root { + + --colorbackhmenu1: #1d1e20; + --colorbackvmenu1: #2b2c2e; + --colorbacktitle1: #2b2d2f; + --colorbacktabcard1: #38393d; + --colorbacktabactive: rgb(220,220,220); + --colorbacklineimpair1: #38393d; + --colorbacklineimpair2: #2b2d2f; + --colorbacklinepair1: #38393d; + --colorbacklinepair2: #2b2d2f; + --colorbacklinepairhover: #2b2d2f; + --colorbacklinepairchecked: #0e5ccd; + --colorbackbody: #1d1e20; + --tooltipbgcolor: #2b2d2f; + --colortexttitlenotab: rgb(220,220,220); + --colortexttitle: rgb(220,220,220); + --colortext: rgb(220,220,220); + --colortextlink: #4390dc; + --colortextbackhmenu: rgb(220,220,220); + --colortextbackvmenu: rgb(220,220,220); + --tooltipfontcolor : rgb(220,220,220); + --listetotal: rgb(245, 83, 158); + --inputbackgroundcolor: #2b2d2f; + --inputbordercolor: rgb(220,220,220); + --oddevencolor: rgb(220,220,220); + --colorboxstatsborder: rgb(65,100,138); + --dolgraphbg: #1d1e20; + --fieldrequiredcolor: rgb(250,183,59); + --colortextbacktab: rgb(220,220,220); + --colorboxiconbg: rgb(36,38,39); + --refidnocolor: rgb(220,220,220); + --tableforfieldcolor:rgb(220,220,220); + --amountremaintopaycolor:rgb(252,84,91); + --amountpaymentcomplete:rgb(101,184,77); + --amountremaintopaybackcolor:rbg(245,130,46); + } + }"; + } +?> body { background-color: #FFFFFF; - background: rgb(); + background: var(--colorbackbody); - color: rgb(); + color: var(--colortext); font-size: ; line-height: 1.4; font-family: ; @@ -31,12 +113,13 @@ body { th a { font-weight: !important; } a.tab { font-weight: 500 !important; } -a:link, a:visited, a:hover, a:active { font-family: ; font-weight: normal; color: rgb(); text-decoration: none; } -a:hover { text-decoration: underline; color: rgb(); } -a.commonlink { color: rgb() !important; text-decoration: none; } +a:link, a:visited, a:hover, a:active { font-family: ; font-weight: normal; color: var(--colortextlink); text-decoration: none; } +a:hover { text-decoration: underline; color: var(--colortextlink); } +a.commonlink { color: var(--colortextlink) !important; text-decoration: none; } th.liste_titre a div div:hover, th.liste_titre_sel a div div:hover { text-decoration: underline; } input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select { - background-color: #FFF; + background-color: var(--inputbackgroundcolor); + color: var(--colortext); } select.vmenusearchselectcombo { background-color: unset; @@ -77,7 +160,7 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla font-family: ; outline: none; margin: 0px 0px 0px 0px; - borderglobal->THEME_HIDE_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px rgba(0,0,0,.2); + borderglobal->THEME_HIDE_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor); } input { @@ -237,7 +320,7 @@ select.flat, form.flat select { font-size: unset; } .optionblue { - color: rgb(); + color: var(--colortextlink); } .select2-results .select2-highlighted.optionblue { color: #FFF !important; @@ -535,7 +618,7 @@ body[class*="colorblind-"] .text-success{ color: #ccc !important; } .editfielda span.fa-pencil-alt:hover, .editfielda span.fa-trash:hover { - color: rgb() !important; + color: var(--colortexttitle) !important; } .fa-toggle-on, .fa-toggle-off { font-size: 2em; } @@ -708,16 +791,17 @@ select.flat.selectlimit { .amountalreadypaid { } .amountpaymentcomplete { - color: #008800; + color: var(--amountpaymentcomplete); font-weight: bold; font-size: 1.2em; } .amountremaintopay { - color: #880000; + color: var(--amountremaintopaycolor); font-weight: bold; font-size: 1.2em; } .amountremaintopayback { + color: var(--amountremaintopaybackcolor); font-weight: bold; font-size: 1.2em; } @@ -1067,7 +1151,7 @@ table[summary="list_of_modules"] .fa-cog { .linkobject { cursor: pointer; } table.tableforfield tr>td:first-of-type, div.tableforfield div.tagtr>div.tagtd:first-of-type { - color: #666; + color: var(--tableforfieldcolor); } @@ -1114,7 +1198,7 @@ td.showDragHandle { #id-right { /* This must stay id-right and not be replaced with echo $right */ padding-top: 10px; width: 100%; - background: rgb(); + background: var(--colorbackbody); padding-bottom: 20px; } #id-left { @@ -1135,7 +1219,7 @@ td.showDragHandle { display: table-cell; border-: 1px solid #d0d0d0; box-shadow: 3px 0 6px -2px #eee; - background: rgb(); + background: var(--colorbackvmenu1); transition: left 0.5s ease; } @@ -1228,7 +1312,7 @@ body.sidebar-collapse .login_block { .menuhider { display: block !important; } .dropdown-user-image { display: none; } -.user-header { height: auto !important; color: rgb(); } +.user-header { height: auto !important; color: var(--colorbackbody); } #id-container { width: 100%; @@ -1297,7 +1381,7 @@ div.fichetwothirdright { browser->layout == 'phone') { print "padding-bottom: 6px\n"; } ?> } div.fichetwothirdright div.ficheaddleft { - padding-: 20px; + padding-: 20px; } div.fichehalfleft { browser->layout != 'phone') { print "float: ".$left.";\n"; } ?> @@ -1517,10 +1601,10 @@ img.photorefnoborder { } .underbanner { border-bottom: px solid rgb(); - /* border-bottom: 2px solid rgb(); */ + /* border-bottom: 2px solid var(--colorbackhmenu1); */ } .trextrafieldseparator td { - /* border-bottom: 2px solid rgb() !important; */ + /* border-bottom: 2px solid var(--colorbackhmenu1) !important; */ border-bottom: 2px solid rgb() !important; } @@ -1537,9 +1621,8 @@ div#id-top { display:none; - background: rgb(); - background-image: linear-gradient(-45deg, , rgb()); - /* box-shadow: 0px 0px 5px #eee; */ + background: var(--colorbackhmenu1); + background-image: linear-gradient(-45deg, , var(--colorbackhmenu1)); } @@ -1594,7 +1677,7 @@ a.tmenu, a.tmenusel, a.tmenudisabled { a.tmenudisabled:link, a.tmenudisabled:visited, a.tmenudisabled:hover, a.tmenudisabled:active { padding: 0px 5px 0px 5px; white-space: nowrap; - color: #; + color: var(--colortextbackhmenu); text-decoration: none; cursor: not-allowed; } @@ -1602,14 +1685,14 @@ a.tmenudisabled:link, a.tmenudisabled:visited, a.tmenudisabled:hover, a.tmenudis a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active { padding: 0px 4px 0px 4px; white-space: nowrap; - color: #; + color: var(--colortextbackhmenu); text-decoration: none; } a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active { padding: 0px 4px 0px 4px; margin: 0px 0px 0px 0px; white-space: nowrap; - color: #; + color: var(--colortextbackhmenu); text-decoration: none !important; } @@ -2050,7 +2133,7 @@ div.login_block { } div.login_block a { - color: #; + color: var(--colortextbackhmenu); display: inline-block; } div.login_block table { @@ -2062,10 +2145,10 @@ div.login { float: right; } div.login a { - color: #; + color: var(--colortextbackvmenu); } div.login a:hover { - color: #; + color: var(--colortextbackvmenu); text-decoration:underline; } .login_block_elem a span.atoplogin, .login_block_elem span.atoplogin { @@ -2197,11 +2280,20 @@ input.vmenusearchselectcombo[type=text] { a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active, span.vmenu, span.vsmenu { white-space: nowrap; font-family: ; text-align: ; font-weight: bold; } /* bold = 600, 500 is ko with Edge on 1200x960 */ font.vmenudisabled { font-family: ; text-align: ; font-weight: bold; color: #aaa; margin-left: 4px; } /* bold = 600, 500 is ko with Edge on 1200x960 */ -a.vmenu:link, a.vmenu:visited { color: #; } +a.vmenu:link, a.vmenu:visited { color: var(--colortextbackvmenu); } -a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { font-family: ; text-align: ; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; } +a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { + font-family: ; + text-align: ; + font-weight: normal; + color: #202020; + margin: 1px 1px 1px 6px; +} font.vsmenudisabled { font-family: ; text-align: ; font-weight: normal; color: #aaa; } -a.vsmenu:link, a.vsmenu:visited { color: #; white-space: nowrap; } +a.vsmenu:link, a.vsmenu:visited { + color: var(--colortextbackvmenu); + white-space: nowrap; +} font.vsmenudisabledmargin { margin: 1px 1px 1px 6px; } li a.vsmenudisabled, li.vsmenudisabled { color: #aaa !important; } @@ -2253,7 +2345,7 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmen padding-bottom: 7px; margin: 0 0 0 2px; - background: rgb(); + background: var(--colorbackvmenu1); border-left: 1px solid #AAA; border-right: 1px solid #BBB; @@ -2266,7 +2358,7 @@ div.blockvmenusearch text-align: ; text-decoration: none; margin: 1px 0px 0px 2px; - background: rgb(); + background: var(--colorbackvmenu1); } div.blockvmenusearch > form > div { @@ -2391,7 +2483,7 @@ div.tabsElem a.tabactive::before, div.tabsElem a.tabunactive::before { } */ div.tabBar { - color: #; + color: var(--colortextbacktab); padding-top: 16px; padding-left: 0px; padding-right: 0px; padding-bottom: 2px; @@ -2399,7 +2491,7 @@ div.tabBar { border-top: 1px solid #BBB; /* border-bottom: 1px solid #AAA; */ width: auto; - background: rgb(); + background: var(--colorbacktabcard1); } div.tabBar div.titre { padding-top: 20px; @@ -2477,7 +2569,7 @@ a.tabTitle { } a.tabunactive { - color: rgb() !important; + color: var(--colortextlink) !important; } a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { font-family: ; @@ -2494,20 +2586,20 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { background-image: none !important; } .tabactive, a.tab#active { - color: # !important; - background: rgb() !important; + color: var(--colortextbacktab); !important; + background: var(--colorbacktabcard1) !important; margin: 0 0.2em 0 0.2em !important; border-right: 1px solid #CCC !important; border-left: 1px solid #CCC !important; /* border-top: px solid rgb() !important; */ - border-top: px solid rgb() !important; + border-top: px solid var(--colorbackhmenu1) !important; } a.tab:hover { /* - background: rgba(, 0.5) url() 50% 0 repeat-x; - color: #; + background: var(--colorbacktabcard1), 0.5) url() 50% 0 repeat-x; + color: var(--colortextbacktab); */ text-decoration: underline; } @@ -2679,7 +2771,7 @@ table.liste, table.noborder, table.formdoc, div.noborder { border-top-color: rgb(); border-top-style: solid; /* border-top-width: 2px; - border-top-color: rgb(); + border-top-color: var(--colorbackhmenu1); border-top-style: solid; */ /*border-bottom-width: 1px; @@ -2715,7 +2807,7 @@ table.paddingtopbottomonly tr td { padding-bottom: 2px; } .liste_titre_filter { - background: rgb() !important; + background: var(--colorbacktitle1) !important; } table:not(.listwithfilterbefore) tr.liste_titre_filter:first-of-type td.liste_titre { padding-top: 5px; @@ -2806,13 +2898,13 @@ div.refidpadding { } div.refid { font-weight: bold; - color: rgb(); + color: var(--colortexttitlenotab); font-size: 1.2em; } div.refidno { padding-top: 3px; font-weight: normal; - color: #444; + color: var(--refidnocolor); font-size: ; line-height: 21px; } @@ -2924,7 +3016,7 @@ div.pagination li .active span:focus { z-index: 2; color: #fff; cursor: default; - background-color: rgb(); + background-color: var(--colorbackhmenu1); border-color: #337ab7; } div.pagination .disabled span, @@ -2961,19 +3053,19 @@ div.pagination li.paginationafterarrows { /* Set the color for hover lines */ .oddeven:hover, .evenodd:hover, .impair:hover, .pair:hover { - background: rgb() !important; /* Must be background to be stronger than background of odd or even */ + background: var(--colorbacklinepairhover) !important; /* Must be background to be stronger than background of odd or even */ } .tredited, .tredited td { - background: rgb() !important; /* Must be background to be stronger than background of odd or even */ + background: var(--colorbacklinepairchecked) !important; /* Must be background to be stronger than background of odd or even */ border-bottom: 0 !important; } .treditedlinefordate { - background: rgb() !important; /* Must be background to be stronger than background of odd or even */ + background: var(--colorbacklinepairchecked) !important; /* Must be background to be stronger than background of odd or even */ border-bottom: 0px; } .highlight { - background: rgb() !important; /* Must be background to be stronger than background of odd or even */ + background: var(--colorbacklinepairchecked) !important; /* Must be background to be stronger than background of odd or even */ } @@ -2989,37 +3081,37 @@ div.pagination li.paginationafterarrows { { font-family: ; margin-bottom: 1px; - color: #202020; + color: var(--oddevencolor); } .impair, .nohover .impair:hover, tr.impair td.nohover { - background: #; + background: var(--colorbacklineimpair1); } #GanttChartDIV { - background-color: #; + background-color: var(--colorbacklineimpair1); } .oddeven, .evenodd, .pair, .nohover .pair:hover, tr.pair td.nohover, .tagtr.oddeven { font-family: ; margin-bottom: 1px; - color: #202020; + color: var(--oddevencolor); } .pair, .nohover .pair:hover, tr.pair td.nohover { - background-color: #; + background-color: var(--colorbacklinepair1); } table.dataTable tr.oddeven { - background-color: # !important; + background-color: var(--colorbacklinepair1) !important; } /* For no hover style */ td.oddeven, table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.impair td, table.nohover tr.pair td, tr.nohover td, form.nohover, form.nohover:hover { - background-color: # !important; - background: # !important; + background-color: var(--colorbacklineimpair1) !important; + background: var(--colorbacklineimpair1) !important; } td.evenodd, tr.nohoverpair td, #trlinefordates td { - background-color: # !important; - background: # !important; + background-color: var(--colorbacklinepair1) !important; + background: var(--colorbacklinepair1) !important; } .trforbreak td { font-weight: bold; @@ -3090,10 +3182,10 @@ div.colorback /* for the form "assign user" on time spent view */ } div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_sel, .tagtr.liste_titre, .tagtr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr { - background: rgb(); + background: var(--colorbacktitle1); font-weight: ; - color: rgb(); + color: var(--colortexttitle); font-family: ; text-align: ; } @@ -3122,10 +3214,10 @@ tr.liste_titre_topborder td { } .liste_titre td a { text-shadow: none !important; - color: rgb(); + color: var(--colortexttitle); } .liste_titre td a.notasortlink { - color: rgb(); + color: var(--colortextlink); } .liste_titre td a.notasortlink:hover { background: transparent; @@ -3153,7 +3245,7 @@ input.liste_titre { line-height: 24px; } .noborder tr.liste_total td, tr.liste_total td, form.liste_total div, .noborder tr.liste_total_wrap td, tr.liste_total_wrap td, form.liste_total_wrap div { - color: #551188; + color: var(--listetotal); font-weight: normal; } .noborder tr.liste_total td, tr.liste_total td, form.liste_total div { @@ -3228,11 +3320,11 @@ div.tabBar .noborder { div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft) > .border > tbody > tr:nth-of-type(even):not(.liste_titre), .liste > tbody > tr:nth-of-type(even):not(.liste_titre), div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft) .oddeven.tagtr:nth-of-type(even):not(.liste_titre) { - background: linear-gradient(bottom, rgb() 85%, rgb() 100%); - background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: linear-gradient(bottom, var(--colorbacklineimpair1) 85%, var(--colorbacklineimpair2) 100%); + background: -o-linear-gradient(bottom, var(--colorbacklineimpair1) 85%, var(--colorbacklineimpair2) 100%); + background: -moz-linear-gradient(bottom, var(--colorbacklineimpair1) 85%, var(--colorbacklineimpair2) 100%); + background: -webkit-linear-gradient(bottom, var(--colorbacklineimpair1) 85%, var(--colorbacklineimpair2) 100%); + background: -ms-linear-gradient(bottom, var(--colorbacklineimpair1) 85%, var(--colorbacklineimpair2) 100%); } .noborder > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre), .noborder .oddeven.tagtr:nth-child(even):not(:last-child) .tagtd:not(.liste_titre) @@ -3244,11 +3336,11 @@ div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft) > .border > tbody > tr:nth-of-type(odd):not(.liste_titre), .liste > tbody > tr:nth-of-type(odd):not(.liste_titre), div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft) .oddeven.tagtr:nth-of-type(odd):not(.liste_titre) { - background: linear-gradient(bottom, rgb() 85%, rgb() 100%); - background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); - background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: linear-gradient(bottom, var(--colorbacklinepair1) 85%, var(--colorbacklinepair2) 100%); + background: -o-linear-gradient(bottom, var(--colorbacklinepair1) 85%, var(--colorbacklinepair2) 100%); + background: -moz-linear-gradient(bottom, var(--colorbacklinepair1) 85%, var(--colorbacklinepair2) 100%); + background: -webkit-linear-gradient(bottom, var(--colorbacklinepair1) 85%, var(--colorbacklinepair2) 100%); + background: -ms-linear-gradient(bottom, var(--colorbacklinepair1) 85%, var(--colorbacklinepair2) 100%); } .noborder > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre), .noborder .oddeven.tagtr:nth-child(odd):not(:last-child) .tagtd:not(.liste_titre) @@ -3257,7 +3349,7 @@ div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright):not(.ficheaddleft } ul.noborder li:nth-child(even):not(.liste_titre) { - background-color: rgb() !important; + background-color: var(--colorbacklinepair2) !important; } @@ -3286,10 +3378,10 @@ ul.noborder li:nth-child(even):not(.liste_titre) { margin-bottom: 5px; text-align: center; - background: #fcfcfc; - border: 1px solid #eee; - border-left: 6px solid #ddd; - box-shadow: 1px 1px 8px #ddd; + background: var(--colorbacktitle1); + border: 1px solid var(--colorboxstatsborder); + border-left: 6px solid var(--colorboxstatsborder); + box-shadow: 1px 1px 8px var(--colorboxstatsborder); border-radius: 0px; } .boxstats, .boxstats130, .boxstatscontent { @@ -3370,7 +3462,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) { span.boxstatstext { opacity: 0.7; line-height: 18px; - color: #000; + color: var(--colortext); } span.boxstatstext img, a.dashboardlineindicatorlate img { border: 0; @@ -3431,7 +3523,7 @@ span.dashboardlineko { border-bottom-width: 1px; border-top: px solid rgb(); - /* border-top: 2px solid rgb() !important; */ + /* border-top: 2px solid var(--colorbackhmenu1) !important; */ } table.noborder.boxtable tr td { height: unset; @@ -3464,8 +3556,8 @@ tr.box_titre { color: #000 !important;*/ /* TO MATCH ELDY */ - background: rgb() - color: rgb(); + background: var(--colorbacktitle1); + color: var(--colortexttitle); font-family: , sans-serif; font-weight: ; border-bottom: 1px solid #FDFFFF; @@ -3539,7 +3631,7 @@ div.warning { background: #fcf8e3; } div.warning a, div.info a, div.error a { - color: rgb(); + color: var(--colortextlink); } /* Error message */ @@ -3599,7 +3691,7 @@ div.boximport { .product_line_stock_ok { color: #002200; } .product_line_stock_too_low { color: #884400; } -.fieldrequired { font-weight: bold; color: #000055; } +.fieldrequired { font-weight: bold; color: var(--fieldrequiredcolor); } .widthpictotitle { width: 44px; text-align: ; } span.widthpictotitle { font-size: 2.5em; }; @@ -3607,7 +3699,7 @@ span.widthpictotitle { font-size: 2.5em; }; .dolgraphtitle { margin-top: 6px; margin-bottom: 4px; } .dolgraphtitlecssboxes { /* margin: 0px; */ } .legendColorBox, .legendLabel { border: none !important; } -div.dolgraph div.legend, div.dolgraph div.legend div { background-color: rgba(255,255,255,0) !important; } +div.dolgraph div.legend, div.dolgraph div.legend div { background-color: var(--dolgraphbg) !important; } div.dolgraph div.legend table tbody tr { height: auto; } td.legendColorBox { padding: 2px 2px 2px 0 !important; } td.legendLabel { padding: 2px 2px 2px 0 !important; } @@ -3666,7 +3758,7 @@ div.titre { } div.titre, .secondary { font-family: ; - color: rgb(); + color: var(--colortexttitlenotab); } table.table-fiche-title .col-title div.titre{ @@ -3815,8 +3907,8 @@ div.ui-tooltip.mytooltip { -o-box-shadow: 0.5px 0.5px 4px 0px rgba(0, 0, 0, 0.5); box-shadow: 0.5px 0.5px 4px 0px rgba(0, 0, 0, 0.5); filter:progid:DXImageTransform.Microsoft.Shadow(color=#656565, Direction=134, Strength=5); - background: !important; - color : ; + background: var(--tooltipbgcolor) !important; + color : var(--tooltipfontcolor); } @@ -3851,7 +3943,7 @@ img.datecallink { padding-left: 2px !important; padding-right: 2px !important; } } table.dp { width: 180px; - background-color: #FFFFFF; + background-color: var(--inputbackgroundcolor); border-top: solid 2px #DDDDDD; border-: solid 2px #DDDDDD; border-: solid 1px #222222; @@ -3913,7 +4005,7 @@ table.dp { } .datenowlink { - color: rgb(); + color: var(--colortextlink); } @@ -4081,7 +4173,7 @@ td.cal_other_month { position:absolute; width:auto; font-size: 1.0em; - background-color:white; + background-color: var(--inputbackgroundcolor); border:1px solid #888; margin:0px; /* padding:0px; This make combo crazy */ @@ -4091,7 +4183,7 @@ td.cal_other_month { margin:0px; padding:0px; } -.ui-autocomplete ul li.selected { background-color: #D3E5EC;} +.ui-autocomplete ul li.selected { background-color: var(--inputbackgroundcolor);} .ui-autocomplete ul li { list-style-type:none; display:block; @@ -4143,7 +4235,7 @@ td.cal_other_month { /* CSS for treeview */ .treeview ul { background-color: transparent !important; margin-top: 4px; padding-top: 4px !important; } .treeview li { background-color: transparent !important; padding: 0 0 0 16px !important; min-height: 26px; } -.treeview .hover { color: rgb() !important; text-decoration: underline !important; } +.treeview .hover { color: var(--colortextlink) !important; text-decoration: underline !important; } @@ -4276,7 +4368,7 @@ A.none, A.none:active, A.none:visited, A.none:hover { /* Style to overwrites JQuery styles */ .ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight { border: 1px solid #888; - background: rgb(); + background: var(--colorbacktitle1); color: unset; } @@ -4724,14 +4816,14 @@ table.dataTable tr.odd td.sorting_1, table.dataTable tr.even td.sorting_1 { height: inherit !important; } .paging_full_numbers a.paginate_active:hover, .paging_full_numbers a.paginate_button:hover { - background-color: #DDD !important; + background-color: var(--colorbackbody) !important; } .paging_full_numbers, .paging_full_numbers a.paginate_active, .paging_full_numbers a.paginate_button { - background-color: #FFF !important; + background-color: var(--colorbackbody) !important; border-radius: inherit !important; } .paging_full_numbers a.paginate_button_disabled:hover, .paging_full_numbers a.disabled:hover { - background-color: #FFF !important; + background-color: var(--colorbackbody) !important; } .paginate_button, .paginate_active { border: 1px solid #ddd !important; @@ -4765,11 +4857,6 @@ div.dataTables_length select { /* Select2 */ /* ============================================================================== */ -.select2-container--default .select2-results__option--highlighted[aria-selected] { - background-color: rgb(); - color: #; -} - .select2-container--focus span.select2-selection.select2-selection--single { border-bottom: 1px solid #666 !important; } @@ -4777,10 +4864,11 @@ div.dataTables_length select { .blockvmenusearch .select2-container--default .select2-selection--single, .blockvmenubookmarks .select2-container--default .select2-selection--single { - background-color: unset; + background-color: var(--colorbackvmenu1); } .select2-container--default .select2-selection--single .select2-selection__rendered { - color: unset; + color: var(--colortext); + background-color: var(--colorbackvmenu1); } .select2-default { color: #999 !important; @@ -4799,7 +4887,7 @@ div.dataTables_length select { background-image: none; } .select2-container .select2-choice { - color: #000; + color: var(--colortext); border-radius: 0; } .selectoptiondisabledwhite { @@ -4840,7 +4928,12 @@ div.dataTables_length select { .select2-container--default .select2-selection--multiple { border: solid 1px rgba(0,0,0,.2); border-radius: 0 !important; + background: var(--inputbackgroundcolor); } +.select2-container--default .select2-selection--multiple .select2-selection__choice{ + background-color: var(--inputbackgroundcolor); +} + .select2-search__field { outline: none; @@ -4851,6 +4944,7 @@ div.dataTables_length select { -webkit-box-shadow: none !important; box-shadow: none !important; border-radius: 0 !important; + color: black; } .select2-container-active .select2-choice, .select2-container-active .select2-choices { @@ -4862,11 +4956,12 @@ div.dataTables_length select { box-shadow: none !important; } .select2-dropdown { - border: 1px solid #ccc; - box-shadow: 1px 2px 10px #ddd; + background-color: var(--colorbackvmenu1); + border: 1px solid var(--colorbackvmenu1);; + box-shadow: 1px 2px 10px var(--colorbackvmenu1); } .select2-dropdown-open { - background-color: #fff; + background-color: var(--colorbackvmenu1); } .select2-dropdown-open .select2-choice, .select2-dropdown-open .select2-choices { @@ -4876,7 +4971,7 @@ div.dataTables_length select { border-bottom: none; -webkit-box-shadow: none !important; box-shadow: none !important; - background-color: #fff; + background-color: var(--colorbackvmenu1); } .select2-disabled { @@ -4894,7 +4989,7 @@ div.dataTables_length select { } div.select2-drop-above { - background: #fff; + background: var(--colorbackvmenu1);e -webkit-box-shadow: none !important; box-shadow: none !important; } @@ -4916,13 +5011,13 @@ a span.select2-chosen } .select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-ajax-error, .select2-results .select2-selection-limit { - background: #FFFFFF; + background: var(--colorbackvmenu1); } .select2-results { max-height: 400px; } .select2-container.select2-container-disabled .select2-choice, .select2-container-multi.select2-container-disabled .select2-choices { - background-color: #FFFFFF; + background-color: var(--colorbackvmenu1); background-image: none; border: none; cursor: default; @@ -4952,7 +5047,7 @@ a span.select2-chosen opacity: 0.4; } .select2-container--default .select2-selection--single .select2-selection__placeholder { - color: unset; + color: var(--colortext); opacity: 0.4; } span#select2-boxbookmark-container, span#select2-boxcombo-container { @@ -4983,15 +5078,15 @@ span#select2-boxbookmark-container, span#select2-boxcombo-container { cursor: default; border: 1px solid #aaaaaa; border-radius: 3px; - -webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05); - box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05); + -webkit-box-shadow: 0 0 2px var(--inputbackgroundcolor) inset, 0 1px 0 rgba(0, 0, 0, 0.05); + box-shadow: 0 0 2px var(--inputbackgroundcolor) inset, 0 1px 0 rgba(0, 0, 0, 0.05); background-clip: padding-box; -webkit-touch-callout: none; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; - background-color: #e4e4e4; + background-color: var(--inputbackgroundcolor); background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee)); background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%); background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%); @@ -5056,7 +5151,7 @@ span.noborderoncategories { top: 0.8em; float: left; min-width: 100%; - background: #fff; + background: var(--inputbackgroundcolor); margin: 1em 0; padding: 0.4em 0; border: 1px solid #aaa; @@ -5076,7 +5171,7 @@ span.noborderoncategories { overflow: hidden; text-overflow: ellipsis; vertical-align: middle; - background-color: #fff; + background-color: var(--inputbackgroundcolor); cursor: default; border: none; @@ -5155,7 +5250,7 @@ dl.dropdown { display:none; } .dropdown dd ul { - background-color: #FFF; + background-color: var(--inputbackgroundcolor); box-shadow: 1px 1px 10px #aaa; display:none; :0px; /* pop is align on right */ @@ -5171,8 +5266,8 @@ dl.dropdown { white-space: nowrap; font-weight: normal; padding: 7px 8px 7px 8px; - /* color: rgb(); */ - color: #000; + /* color: var(--colortext); */ + color: var(--colortext); } .dropdown dd ul li:hover { background: #eee; @@ -5188,7 +5283,7 @@ dl.dropdown { color: #888; } .dropdown dd ul li a:hover { - background-color:#eee; + background-color: var(--inputbackgroundcolor); } dd.dropdowndd ul li { text-overflow: ellipsis; @@ -5291,10 +5386,10 @@ a.tab span.ui-btn-inner } .ui-link { - color: rgb(); + color: var(--colortext); } .liste_titre .ui-link { - color: rgb() !important; + color: var(--colortexttitle) !important; } a.ui-link { @@ -5362,14 +5457,14 @@ ul.ulmenu { border: none; background: none; text-shadow: none; - color: rgb() !important; + color: var(--colortexttitlenotab) !important; } .ui-bar-b, .lilevel0 { background-repeat: repeat-x; border: none; background: none; text-shadow: none; - color: rgb() !important; + color: var(--colortexttitlenotab) !important; } .alilevel0 { font-weight: normal !important; @@ -5379,7 +5474,7 @@ ul.ulmenu { border-bottom-width: 0px !important; } .alilevel0 { - color: rgb() !important; + color: var(--colortexttitle) !important; background: #f8f8f8 } .ulmenu { @@ -5398,7 +5493,7 @@ ul.ulmenu { text-shadow: none; } .ui-body-c .ui-link, .ui-body-c .ui-link:visited, .ui-body-c .ui-link:hover { - color: rgb(); + color: var(--colortextlink); } .ui-btn-up-c .vsmenudisabled { color: # !important; @@ -5408,7 +5503,7 @@ div.tabsElem a.tab { background: transparent; } .alilevel1 { - color: rgb() !important; + color: var(--colortexttitlenotab) !important; } .lilevel1 { border-top: 2px solid #444; @@ -5855,7 +5950,7 @@ div.tabsElem a.tab { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - color: #; + color: var(--colortextbackhmenu); } .mainmenuaspan { font-size: 0.9em; @@ -5916,12 +6011,12 @@ div.tabsElem a.tab { { .side-nav { z-index: 200; - background: rgb(); + background: var(--colorbackvmenu1); padding-top: 70px; } #id-left { z-index: 201; - background: rgb(); + background: var(--colorbackvmenu1); } .login_vertical_align { @@ -5960,7 +6055,7 @@ div.tabsElem a.tab { text-align: center; vertical-align: middle; - background: rgb(); + background: var(--colorbackvmenu1); height: 50px; @@ -6026,6 +6121,8 @@ div.tabsElem a.tab { } } + + global->THEME_CUSTOM_CSS)) print $conf->global->THEME_CUSTOM_CSS; + +?> + +div.flot-text .flot-tick-label .tickLabel{ + color: unset; +} From 7457796a953c0865a3972aa8bece9d455a05d4fe Mon Sep 17 00:00:00 2001 From: Pierre Ardoin <32256817+mapiolca@users.noreply.github.com> Date: Fri, 21 Feb 2020 17:38:10 +0100 Subject: [PATCH 5/7] Add Dark mode --- htdocs/theme/eldy/btn.inc.php | 42 +++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php index edf40cf2b52..9788a1176bb 100644 --- a/htdocs/theme/eldy/btn.inc.php +++ b/htdocs/theme/eldy/btn.inc.php @@ -3,6 +3,34 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> /*