diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 8c27b101fa4dc4ad6af9bba19f82db5a97ec9cac..67713d7bd2c7532d4968fd373e96c40fdfc86a45 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -5618,11 +5618,11 @@ function printCommonFooter($zone='private') if (empty($conf->dol_use_jmobile)) { - print '<!-- Set handler to switch left menu page -->'."\n"; + print '<!-- Set handler to switch left menu page (menuhider) -->'."\n"; print 'jQuery(".menuhider").click(function() {'; print ' console.log("We click on .menuhider");'."\n"; print " $('.side-nav').toggle();"; - if ($conf->theme == 'md') print " $('.login_block').toggle();"; + print " $('.login_block').toggle();"; print '});'."\n"; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index a797d6f760b846bbdd08c29a33bb1021a4e4ed35..a63593292b666aa2e37cc1c0cb8a33f14d7e28b2 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -691,7 +691,7 @@ div.fiche>form>div.div-table-responsive { justify-content: flex-start; } .thumbstat { - flex: 1 1 120px; + flex: 1 1 114px; } .thumbstat150 { flex: 1 1 170px; @@ -4538,10 +4538,17 @@ div.tabsElem a.tab { /* rule to reduce top menu - 3rd reduction */ @media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 3.4, 0) + 8; ?>px) /* reduction 3 */ { - /* Reduce login top right info */ - .usertextatoplogin { - display: none; + .side-nav { + z-index: 200; + background: #FFF; + padding-top: 70px; + } + #id-left { + z-index: 201; + background: #FFF; } + + /* Reduce login top right info */ .help { <?php if ($disableimages) { ?> display: none; @@ -4551,19 +4558,33 @@ div.tabsElem a.tab { <?php if (GETPOST("optioncss") == 'print') { ?> display:none; <?php } else { ?> - padding-<?php echo $right; ?>: 78px; + padding-<?php echo $right; ?>: 0; <?php } ?> } div.login_block_user { min-width: 0; + width: 100%; } div.login_block { - top: 2px; - <?php if ($disableimages) { ?> - max-width: 100px; - <?php } else { ?> - max-width: 82px; - <?php } ?> + display: none; + top: inherit !important; + left: 0 !important; + text-align: center; + vertical-align: middle; + background: #FFF; + height: 42px; + padding-top: 20px; + padding-left: 20px; + padding-right: 20px; + z-index: 202; + min-width: 190px; + max-width: 190px; + width: 190px; + } + div.login_block_user, div.login_block_other { clear: both; } + .atoplogin, .atoplogin:hover + { + color: #000 !important; } .login_block_elem { padding: 0 !important; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 6e85ca8eb7d1c8d884d7bd8161dfa9aef99efe56..26c4c4d0a936ab54a2187d7acfcf2a948f606131 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -692,7 +692,7 @@ div.fiche>form>div.div-table-responsive { justify-content: flex-start; } .thumbstat { - flex: 1 1 120px; + flex: 1 1 114px; } .thumbstat150 { flex: 1 1 150px; @@ -1681,7 +1681,7 @@ div.login_block_other { padding-top: 3px; } height: 16px; } .login_block_elem_name { - margin-top: 5px; + margin-top: 1px; } .atoplogin, .atoplogin:hover { color: #<?php echo $colortextbackvmenu; ?> !important;