lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX toggle of login_block was ko with eldy theme

Browse Source
This commit is contained in:
Laurent Destailleur 2019-03-19 14:22:57 +01:00
parent 07a8d00d40
commit 70c2ffc816
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/lib/functions.lib.php
View File

@ -7195,7 +7195,6 @@ function printCommonFooter($zone = 'private')
print ' if(!$( "body" ).hasClass( "sidebar-collapse" )){ event.preventDefault(); }'."\n"; print ' if(!$( "body" ).hasClass( "sidebar-collapse" )){ event.preventDefault(); }'."\n";
print ' console.log("We click on .menuhider");'."\n"; print ' console.log("We click on .menuhider");'."\n";
print ' $("body").toggleClass("sidebar-collapse")'."\n"; print ' $("body").toggleClass("sidebar-collapse")'."\n";
print ' $(".login_block").toggle()'."\n";
print '});'."\n"; print '});'."\n";
} }

10
htdocs/theme/eldy/global.inc.php
View File

@ -966,7 +966,11 @@ td.showDragHandle {
transition: left 0.5s ease; transition: left 0.5s ease;
} }
body.sidebar-collapse .side-nav { .side-nav, .login_block {
transition: left 0.5s ease;
}
body.sidebar-collapse .side-nav, body.sidebar-collapse .login_block {
display: none; display: none;
} }
@ -1829,6 +1833,9 @@ div.login a:hover {
color: #<?php echo $colortextbackvmenu; ?>; color: #<?php echo $colortextbackvmenu; ?>;
text-decoration:underline; text-decoration:underline;
} }
.login_block_elem a span.atoplogin, .login_block_elem span.atoplogin {
vertical-align: middle;
}
div.login_block_user { div.login_block_user {
display: inline-block; display: inline-block;
padding-top: 3px; padding-top: 3px;
@ -5644,7 +5651,6 @@ div.tabsElem a.tab {
div.login_block { div.login_block {
<?php if ($conf->browser->layout == 'phone' && ((GETPOST('testmenuhider', 'int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?> <?php if ($conf->browser->layout == 'phone' && ((GETPOST('testmenuhider', 'int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
/* Style when phone layout or when using the menuhider */ /* Style when phone layout or when using the menuhider */
display: none;
padding-top: 20px; padding-top: 20px;
padding-left: 20px; padding-left: 20px;
padding-right: 20px; padding-right: 20px;

4
htdocs/theme/md/style.css.php
View File

@ -1279,7 +1279,9 @@ div.login_block {
.login_block_getinfo .atoplogin, .login_block_getinfo .atoplogin:hover { .login_block_getinfo .atoplogin, .login_block_getinfo .atoplogin:hover {
color: #333 !important; color: #333 !important;
} }
.login_block_elem a span.atoplogin, .login_block_elem span.atoplogin {
vertical-align: middle;
}