This commit is contained in:
Laurent Destailleur 2022-05-07 19:47:51 +02:00
parent 6b9ed5aa32
commit 3256ac2f2a
5 changed files with 70 additions and 14 deletions

View File

@ -2083,6 +2083,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
print "</div>\n"; // end div class="login_block" print "</div>\n"; // end div class="login_block"
print '</header>'; print '</header>';
//print '<header class="header2">&nbsp;</header>';
print '<div style="clear: both;"></div>'; print '<div style="clear: both;"></div>';
print "<!-- End top horizontal menu -->\n\n"; print "<!-- End top horizontal menu -->\n\n";

View File

@ -121,8 +121,17 @@ button.dropdown-item.global-search-item {
text-decoration: none !important; text-decoration: none !important;
} }
/* CSS to hide the arrow to show open/close */
div#topmenu-quickadd-dropdown, div#topmenu-bookmark-dropdown {
padding-right: 5px;
}
div#topmenu-quickadd-dropdown a::after, div#topmenu-bookmark-dropdown a::after {
display: none;
}
.dropdown-toggle::after { .dropdown-toggle::after {
/* font part */
font-family: "Font Awesome 5 Free"; font-family: "Font Awesome 5 Free";
font-size: 0.7em; font-size: 0.7em;
font-weight: 900; font-weight: 900;
@ -141,6 +150,7 @@ button.dropdown-item.global-search-item {
transition: transform .2s ease-in-out; transition: transform .2s ease-in-out;
} }
.open>.dropdown-toggle::after { .open>.dropdown-toggle::after {
transform: rotate(180deg); transform: rotate(180deg);
} }

View File

@ -2605,27 +2605,45 @@ a.tmenuimage:hover{
/* To show text of top menu on hover only (THEME_TOPMENU_DISABLE_IMAGE == 2) */ /* To show text of top menu on hover only (THEME_TOPMENU_DISABLE_IMAGE == 2) */
<?php if (in_array(getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE'), array(2, 3, 4))) { ?> <?php if (in_array(getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE'), array(2, 3, 4))) { ?>
.tmenulabel:not(.menuhider), .tmenulabel:not(.menuhider):before { .tmenulabel:not(.menuhider), .tmenulabel:not(.menuhider)::before {
display: none; display: none;
/* opacity: 0; To show text after transition */
} }
a.tmenuimage:not(.menuhider), a.tmenuimage:not(.menuhider):before, a.tmenuimage:not(.menuhider), a.tmenuimage:not(.menuhider)::before,
div.tmenuimage:not(.menuhider), div.tmenuimage:not(.menuhider):before, div.tmenuimage:not(.menuhider), div.tmenuimage:not(.menuhider)::before,
span.tmenuimage:not(.menuhider), span.tmenuimage:not(.menuhider):before { span.tmenuimage:not(.menuhider), span.tmenuimage:not(.menuhider)::before {
font-size: 1.3em; font-size: 1.3em;
margin-top: 10px !important; margin-top: 8px !important;
} }
<?php } ?> <?php } ?>
<?php if (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 2) { ?> <?php if (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 2) { ?>
.tmenudiv:hover .tmenulabel:not(.menuhider), .tmenudiv:hover .tmenulabel:not(.menuhider):before { .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; 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 {
font-size: 1.1em !important; .tmenudiv:hover .tmenuimage:not(.menuhider), .tmenudiv:hover .tmenuimage:not(.menuhider)::before {
/* For transition transition-delay: 1000ms;
transition-property: all; */
margin-top: 0px !important; margin-top: 0px !important;
} }
<?php } ?> <?php } ?>
<?php if (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 3) { ?> <?php if (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 3) { ?>
li.tmenu:hover .tmenulabel:not(.menuhider), li.tmenu:hover .tmenulabel:not(.menuhider):before { li.tmenu:hover .tmenulabel:not(.menuhider), li.tmenu:hover .tmenulabel:not(.menuhider)::before {
display: initial !important; display: initial !important;
} }
li.tmenu:hover .tmenuimage:not(.menuhider), li.tmenu:hover .tmenuimage:not(.menuhider):before { li.tmenu:hover .tmenuimage:not(.menuhider), li.tmenu:hover .tmenuimage:not(.menuhider):before {
@ -2694,12 +2712,14 @@ li.tmenu:hover .tmenuimage:not(.menuhider), li.tmenu:hover .tmenuimage:not(.menu
$url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1); $url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1);
print "div.mainmenu.".$val." {\n"; print "div.mainmenu.".$val." {\n";
print " background-image: url(".$url.");\n"; print " background-image: url(".$url.");\n";
print " background-position-y: 3px;\n";
print "}\n"; print "}\n";
} }
$generic++; $generic++;
} else { } else {
print "div.mainmenu.".$val." {\n"; print "div.mainmenu.".$val." {\n";
print " background-image: url(".$url.");\n"; print " background-image: url(".$url.");\n";
print " background-position-y: 3px;\n";
print "}\n"; print "}\n";
} }
} }
@ -7321,11 +7341,18 @@ div.clipboardCPValue.hidewithsize {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
color: var(--colortextbackhmenu);
/* color: var(--colorbackhmenu1); */
}
.tmenuimage {
color: var(--colortextbackhmenu); color: var(--colortextbackhmenu);
} }
.mainmenuaspan { .mainmenuaspan {
font-size: 0.9em; font-size: 0.9em;
padding-right: 0; padding-right: 0;
padding-left: 0;
} }
.topmenuimage { .topmenuimage {
background-size: 22px auto; background-size: 22px auto;
@ -7380,6 +7407,15 @@ div.clipboardCPValue.hidewithsize {
/* rule to reduce top menu - 3rd reduction: The menu for user is on left */ /* rule to reduce top menu - 3rd reduction: The menu for user is on left */
@media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px) /* reduction 3 */ @media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px) /* reduction 3 */
{ {
<?php if (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 2) { ?>
.tmenudiv .tmenulabel span.mainmenuaspan {
display: none !important;
}
.tmenudiv:hover .tmenuimage:not(.menuhider), .tmenudiv:hover .tmenuimage:not(.menuhider):before {
margin-top: 8px !important;
}
<?php } ?>
.side-nav { .side-nav {
z-index: 200; z-index: 200;
background: var(--colorbackvmenu1); background: var(--colorbackvmenu1);

View File

@ -10,12 +10,12 @@
font-style: normal; font-style: normal;
font-variant: normal; font-variant: normal;
text-rendering: auto; text-rendering: auto;
line-height: 23px; line-height: 28px;
font-size: <?php echo $topMenuFontSize; ?>;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
text-align:center; text-align:center;
text-decoration:none; text-decoration:none;
color: var(--colortextbackhmenu); color: var(--colortextbackhmenu);
/* font-size: <?php echo $topMenuFontSize; ?>; */
} }
.fa-15x { .fa-15x {

View File

@ -26,7 +26,7 @@ button.dropdown-item.global-search-item {
} }
div#topmenu-quickadd-dropdown { div#topmenu-quickadd-dropdown {
position: fixed; position: fixed;
<?php echo $right; ?>: 65px; <?php echo $right; ?>: 55px;
top: 0px; top: 0px;
} }
div#topmenu-bookmark-dropdown { div#topmenu-bookmark-dropdown {
@ -124,6 +124,15 @@ button.dropdown-item.global-search-item {
} }
/* CSS to hide the arrow to show open/close */
div#topmenu-quickadd-dropdown, div#topmenu-bookmark-dropdown {
padding-right: 2px;
}
div#topmenu-quickadd-dropdown a::after, div#topmenu-bookmark-dropdown a::after {
display: none;
}
.dropdown-toggle{ .dropdown-toggle{
text-decoration: none !important; text-decoration: none !important;
} }