From b9c08853bec790e8b71ec62781b78f4150f50cef Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 28 Nov 2018 16:54:21 +0100 Subject: [PATCH] CSS --- htdocs/core/lib/usergroups.lib.php | 16 ++++++++-------- htdocs/theme/eldy/style.css.php | 16 ++++++++-------- htdocs/theme/md/style.css.php | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index 32b2be816df..033d4eb37fe 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -822,22 +822,22 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) //print '   ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')'; if ($edit) { - if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb'; + if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='e6edf0'; else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),''); print $formother->selectColor($color,'THEME_ELDY_USE_HOVER','formcolor',1).' '; } else { - if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='edf4fb'; + if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color='e6edf0'; else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER,array()),''); if ($color) { - if ($color != 'edf4fb') print ''; + if ($color != 'e6edf0') print ''; else print $langs->trans("Default"); } else print $langs->trans("None"); } - print '   ('.$langs->trans("Default").': edf4fb) '; + print '   ('.$langs->trans("Default").': e6edf0) '; print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis")); print ''; print ''; @@ -866,22 +866,22 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) //print '   ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')'; if ($edit) { - if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color='ffefbb'; + if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color='e6edf0'; else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED,array()),''); print $formother->selectColor($color,'THEME_ELDY_USE_CHECKED','formcolor',1).' '; } else { - if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color='ffefbb'; + if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color='e6edf0'; else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED,array()),''); if ($color) { - if ($color != 'ffefbb') print ''; + if ($color != 'e6edf0') print ''; else print $langs->trans("Default"); } else print $langs->trans("None"); } - print '   ('.$langs->trans("Default").': ffefbb) '; + print '   ('.$langs->trans("Default").': e6edf0) '; print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis")); print ''; print ''; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 487d4125284..1b9d219ac10 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -45,9 +45,9 @@ $colorbacktabcard1='255,255,255'; // card $colorbacktabactive='234,234,234'; $colorbacklineimpair1='255,255,255'; // line impair $colorbacklineimpair2='255,255,255'; // line impair -$colorbacklinepair1='250,250,250'; // line pair -$colorbacklinepair2='250,250,250'; // line pair -$colorbacklinepairhover='238,246,252'; // line pair +$colorbacklinepair1='234,234,234'; // line pair +$colorbacklinepair2='234,234,234'; // line pair +$colorbacklinepairhover='230,237,244'; // line hover $colorbacklinebreak='214,218,220'; // line break $colorbackbody='255,255,255'; $colortexttitlenotab='100,60,20'; @@ -144,12 +144,12 @@ $fontsize =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty( $fontsizesmaller =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE2) ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE2) :(empty($user->conf->THEME_ELDY_FONT_SIZE2)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE2); // Hover color -$colorbacklinepairhover=((! isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '0')?'':($conf->global->THEME_ELDY_USE_HOVER === '1'?'edf4fb':$conf->global->THEME_ELDY_USE_HOVER)); -$colorbacklinepairchecked=((! isset($conf->global->THEME_ELDY_USE_CHECKED) || (string) $conf->global->THEME_ELDY_USE_CHECKED === '0')?'':($conf->global->THEME_ELDY_USE_CHECKED === '1'?'edf4fb':$conf->global->THEME_ELDY_USE_CHECKED)); +$colorbacklinepairhover=((! isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '0')?'':($conf->global->THEME_ELDY_USE_HOVER === '1'?'e6edf0':$conf->global->THEME_ELDY_USE_HOVER)); +$colorbacklinepairchecked=((! isset($conf->global->THEME_ELDY_USE_CHECKED) || (string) $conf->global->THEME_ELDY_USE_CHECKED === '0')?'':($conf->global->THEME_ELDY_USE_CHECKED === '1'?'e6edf0':$conf->global->THEME_ELDY_USE_CHECKED)); if (! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)) { - $colorbacklinepairhover=((! isset($user->conf->THEME_ELDY_USE_HOVER) || $user->conf->THEME_ELDY_USE_HOVER === '0')?'':($user->conf->THEME_ELDY_USE_HOVER === '1'?'edf4fb':$user->conf->THEME_ELDY_USE_HOVER)); - $colorbacklinepairchecked=((! isset($user->conf->THEME_ELDY_USE_CHECKED) || $user->conf->THEME_ELDY_USE_CHECKED === '0')?'':($user->conf->THEME_ELDY_USE_CHECKED === '1'?'edf4fb':$user->conf->THEME_ELDY_USE_CHECKED)); + $colorbacklinepairhover=((! isset($user->conf->THEME_ELDY_USE_HOVER) || $user->conf->THEME_ELDY_USE_HOVER === '0')?'':($user->conf->THEME_ELDY_USE_HOVER === '1'?'e6edf0':$user->conf->THEME_ELDY_USE_HOVER)); + $colorbacklinepairchecked=((! isset($user->conf->THEME_ELDY_USE_CHECKED) || $user->conf->THEME_ELDY_USE_CHECKED === '0')?'':($user->conf->THEME_ELDY_USE_CHECKED === '1'?'e6edf0':$user->conf->THEME_ELDY_USE_CHECKED)); } //$colortopbordertitle1=$colorbackhmenu1; @@ -3261,7 +3261,7 @@ ul.noborder li:nth-child(even):not(.liste_titre) { margin-bottom: 5px; text-align: center; - background: #fcfcfc; + background: #e7e7e7; border: 1px solid #eee; /* border-left: 6px solid #ddd; */ box-shadow: 1px 1px 8px #ddd; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 72edb17b719..2e663cfdb30 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -48,7 +48,7 @@ $colorbacklineimpair1='255,255,255'; // line impair $colorbacklineimpair2='255,255,255'; // line impair $colorbacklinepair1='248,248,248'; // line pair $colorbacklinepair2='246,246,246'; // line pair -$colorbacklinepairhover='244,244,244'; // line pair +$colorbacklinepairhover='230,237,244'; // line pair $colorbacklinebreak='214,218,220'; $colorbackbody='248,248,248'; $colortexttitlenotab='90,90,90';