diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 48a83292bd9..7e205b0394a 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -583,12 +583,9 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes"), 1, 'help', 'inline-block');
print '';
print '';
- /*
- print '
'.$langs->trans("EnableShowLogo").' ' . yn($conf->global->MAIN_SHOW_LOGO) . ' ';
- print " ";*/
}
- // Main menu color logo
+ // Main menu color on pictos
if ($foruserprofile) {
// Nothing
} else {
@@ -605,7 +602,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
print '';
}
- // BorderTableActive
+ // Use border on tables
if ($foruserprofile) {
} else {
print '';
@@ -645,48 +642,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
}
*/
- // Background color THEME_ELDY_BACKBODY
- if ($foruserprofile) {
- /*
- print ' ';
- print ''.$langs->trans("TopMenuBackgroundColor").' ';
- print ''.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).' ';
- print 'conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
- print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"'; // Disabled for demo
- print '> '.$langs->trans("UsePersonalValue").' ';
- print '';
- if ($edit) {
- print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','',1).' ';
- } else {
- $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
- if ($color) print ' ';
- else print '';
- }
- if ($edit) print ' ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
- print ' ';*/
- } else {
- $default = 'ffffff';
- print ' ';
- print ''.$langs->trans("BackgroundColor").' ';
- print '';
- //var_dump($conf->global->THEME_ELDY_BACKBODY);
- if ($edit) {
- print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_BACKBODY') ? $conf->global->THEME_ELDY_BACKBODY : ''), array()), ''), 'THEME_ELDY_BACKBODY', '', 1, '', '', 'colorbackbody', $default).' ';
- } else {
- $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), '');
- if ($color) {
- print ' ';
- } else {
- print $langs->trans("Default");
- }
- }
- print ' '.$langs->trans("Default").' : '.$default.' ';
- print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
- print ' ';
- print ' ';
- }
-
- // TopMenuBackgroundColor
+ // Background color for top menu - TopMenuBackgroundColor
if ($foruserprofile) {
/*
print '';
@@ -730,7 +686,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
print ' ';
}
- // LeftMenuBackgroundColor
+ // Background color for left menu - LeftMenuBackgroundColor
if ($foruserprofile) {
/*
print '';
@@ -774,6 +730,47 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
print ' ';
}
+ // Background color for main area THEME_ELDY_BACKBODY
+ if ($foruserprofile) {
+ /*
+ print '';
+ print ''.$langs->trans("TopMenuBackgroundColor").' ';
+ print ''.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).' ';
+ print 'conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
+ print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"'; // Disabled for demo
+ print '> '.$langs->trans("UsePersonalValue").' ';
+ print '';
+ if ($edit) {
+ print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','',1).' ';
+ } else {
+ $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
+ if ($color) print ' ';
+ else print '';
+ }
+ if ($edit) print ' ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+ print ' ';*/
+ } else {
+ $default = 'ffffff';
+ print ' ';
+ print ''.$langs->trans("BackgroundColor").' ';
+ print '';
+ //var_dump($conf->global->THEME_ELDY_BACKBODY);
+ if ($edit) {
+ print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_BACKBODY') ? $conf->global->THEME_ELDY_BACKBODY : ''), array()), ''), 'THEME_ELDY_BACKBODY', '', 1, '', '', 'colorbackbody', $default).' ';
+ } else {
+ $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), '');
+ if ($color) {
+ print ' ';
+ } else {
+ print $langs->trans("Default");
+ }
+ }
+ print ' '.$langs->trans("Default").' : '.$default.' ';
+ print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+ print ' ';
+ print ' ';
+ }
+
// TextTitleColor for title of Pages
if ($foruserprofile) {
} else {
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index c15bc6608ea..55cc7323a8b 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -2719,7 +2719,9 @@ img.photorefnoborder {
background: var(--colorbackhmenu1);
/* background-image: linear-gradient(-45deg, , var(--colorbackhmenu1)); */
- /* box-shadow: 0px 0px 5px #eee; */
+
+ box-shadow: 0px 0px 4px #ddd;
+
}
@@ -2761,7 +2763,6 @@ div.tmenudiv {
margin: 0px 0px 0px 0px; /* t r b l */
font-size: 13px;
font-weight: normal;
- color: #000000;
text-decoration: none;
}
@@ -2814,6 +2815,9 @@ ul.tmenu { /* t r b l */
}
ul.tmenu li { /* We need this to have background color when menu entry wraps on new lines */
}
+li#mainmenutd_home {
+ margin-left: 5px;
+}
li.tmenu, li.tmenusel {
text-align: center;
@@ -2863,6 +2867,7 @@ div.tmenucenter
{
padding-left: 2px;
padding-right: 2px;
+ color: var(--colortextbackhmenu);
padding-top: 8px;
height: 26px;
@@ -2889,6 +2894,7 @@ div.menu_titre {
padding-: 2px;
font-family: Roboto,;
font-weight: 400;
+ opacity: 0.8;
}
div.mainmenu {
@@ -2927,8 +2933,9 @@ a.tmenuimage:hover{
}
-/* To show text of top menu on hover only (THEME_TOPMENU_DISABLE_IMAGE == 2) */
+/* To show text of top menu according to option THEME_TOPMENU_DISABLE_IMAGE */
+/* Text hidden by default */
.tmenulabel:not(.menuhider), .tmenulabel:not(.menuhider)::before {
display: none;
@@ -2941,7 +2948,14 @@ span.tmenuimage:not(.menuhider), span.tmenuimage:not(.menuhider)::before {
margin-top: 8px !important;
}
+div.tmenucenter { /* we must have a field length of top menu to avoid size to change when in mode text on hover */
+ width: 80px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
+/* Test of picto visible on hover, for all picto */
.tmenudiv:hover .tmenulabel:not(.menuhider), .tmenudiv:hover .tmenulabel:not(.menuhider)::before {
display: block;
@@ -2959,14 +2973,14 @@ span.tmenuimage:not(.menuhider), span.tmenuimage:not(.menuhider)::before {
color: var(--colortextbackhmenu);
top: 0px;
}
-
.tmenudiv:hover .tmenuimage:not(.menuhider), .tmenudiv:hover .tmenuimage:not(.menuhider)::before {
/* For transition transition-delay: 1000ms;
transition-property: all; */
margin-top: 0px !important;
}
-
+
+/* Text of picto visible on hover the picto only */
li.tmenu:hover .tmenulabel:not(.menuhider), li.tmenu:hover .tmenulabel:not(.menuhider)::before {
display: initial !important;
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index dd6b6fdbe5f..bbc9ce8e031 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -405,6 +405,11 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
color: #755114 !important;
}
+/* Disable colors on left vmenu */
+a.vmenu span {
+ color: unset !important;
+}
+
.infobox-adherent, .infobox-member {
color: #79633f;
}
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index 37253abf8c4..a501c7c8747 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -27,7 +27,7 @@ button.dropdown-item.global-search-item {
#topmenu-global-search-dropdown a.login-dropdown-a, #topmenu-quickadd-dropdown a.login-dropdown-a, #topmenu-bookmark-dropdown a.login-dropdown-a {
- color: #fff;
+ color: var(--colortextbackhmenu);
}
div#topmenu-global-search-dropdown {
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index 138fbed8834..9563558a38d 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -91,6 +91,13 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
color: #755114 !important;
}
+/* Disable colors on left vmenu */
+a.vmenu span {
+ color: unset !important;
+}
+div.login_block_other a {
+ color: var(--colortextbackvmenu);
+}
.infobox-adherent, .infobox-member {
color: #79633f;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 30a4824a474..26f72ef4d10 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2317,6 +2317,13 @@ td.showDragHandle {
vertical-align: top;
}
#id-top {
+
+ display:none;
+
+
+ border-bottom: 1px solid rgba(0,0,0,0.2); /* must be same than border-right of .side-nav */
+
+
}
#id-left {
min-height: 100%;
@@ -2869,6 +2876,9 @@ div#tmenu_tooltip {
}
+li#mainmenutd_home {
+ margin-left: 5px;
+}
li.tmenusel::after, li.tmenusel:hover::after {
content: "";
position: absolute;
@@ -3025,6 +3035,7 @@ div.menu_titre {
padding-: 2px;
font-family: Roboto,;
font-weight: 400;
+ opacity: 0.9;
}
div.mainmenu {
@@ -3039,7 +3050,6 @@ a.tmenuimage:focus, .mainmenu.topmenuimage:focus {
outline: none;
}
-
div.mainmenu.home{
background-position-x: center;
}
@@ -3050,6 +3060,58 @@ div.mainmenu.menu {
}
+/* To show text of top menu according to option THEME_TOPMENU_DISABLE_IMAGE */
+
+/* Text hidden by default */
+
+.tmenulabel:not(.menuhider), .tmenulabel:not(.menuhider)::before {
+ display: none;
+ /* opacity: 0; To show text after transition */
+}
+a.tmenuimage:not(.menuhider), a.tmenuimage:not(.menuhider)::before,
+div.tmenuimage:not(.menuhider), div.tmenuimage:not(.menuhider)::before,
+span.tmenuimage:not(.menuhider), span.tmenuimage:not(.menuhider)::before {
+ font-size: 1.3em;
+ margin-top: 8px !important;
+}
+
+
+/* Test of picto visible on hover, for all picto */
+
+.tmenudiv:hover .tmenulabel:not(.menuhider), .tmenudiv:hover .tmenulabel:not(.menuhider)::before {
+ display: block;
+ position: relative;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ /* For transition transition-delay: 1000ms;
+ transition-property: all; */
+ opacity: 1;
+ display: initial !important;
+ line-height: 0.6em !important;
+ height: 1em !important;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ color: var(--colortextbackhmenu);
+ top: 0px;
+}
+.tmenudiv:hover .tmenuimage:not(.menuhider), .tmenudiv:hover .tmenuimage:not(.menuhider)::before {
+ /* For transition transition-delay: 1000ms;
+ transition-property: all; */
+ margin-top: 0px !important;
+}
+
+
+/* Text of picto visible on hover, for the picto only */
+
+li.tmenu:hover .tmenulabel:not(.menuhider), li.tmenu:hover .tmenulabel:not(.menuhider)::before {
+ display: initial !important;
+}
+li.tmenu:hover .tmenuimage:not(.menuhider), li.tmenu:hover .tmenuimage:not(.menuhider):before {
+ font-size: 1.1em !important;
+ margin-top: 0px !important;
+}
+
+
/* Do not load menu img if hidden to save bandwidth */
@@ -3314,7 +3376,7 @@ div.login_block {
top: -1000px;
}
div.login_block a {
- color: var(--colortexthmenu);
+ color: var(--colortextbackvmenu);
display: inline-block;
}
div.login_block a .atoploginusername {
@@ -3325,7 +3387,7 @@ div.login_block a .atoploginusername {
text-overflow: ellipsis;
}
div.login_block span.aversion {
- color: var(--colortexthmenu);
+ color: var(--colortextbackvmenu);
filter: contrast(0.7);
}
div.login_block table {
@@ -3384,7 +3446,7 @@ a.aversion {
}
.atoplogin, .atoplogin:hover {
- color: var(--colortexthmenu) !important;
+ color: var(--colortextbackvmenu) !important;
}
.alogin, .alogin:hover {
color: #888 !important;
@@ -6455,6 +6517,9 @@ input.select2-input {
{
background-color: unset;
}
+#blockvmenusearch .select2-container--default .select2-selection--single .select2-selection__placeholder {
+ color: var(--colortextbackvmenu);
+}
.select2-container--default .select2-selection--single .select2-selection__rendered {
color: unset;
}
@@ -7912,6 +7977,7 @@ table.jPicker {
{
div.tmenucenter {
max-width: 56px; /* size of viewport */
+ width: 52px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;