FIX toggle of login_block was ko with eldy theme

Dolibarr · Mar 19, 2019 · 70c2ffc · 70c2ffc
1 parent 07a8d00
commit 70c2ffc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
@@ -7195,7 +7195,6 @@ function printCommonFooter($zone = 'private')
 				print '  if(!$( "body" ).hasClass( "sidebar-collapse" )){ event.preventDefault(); }'."\n";
 				print '  console.log("We click on .menuhider");'."\n";
 				print '  $("body").toggleClass("sidebar-collapse")'."\n";
-				print '  $(".login_block").toggle()'."\n";
 				print '});'."\n";
 			}
 

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
@@ -966,7 +966,11 @@
 	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;
 }
 
@@ -1829,6 +1833,9 @@
 	color: #<?php echo $colortextbackvmenu; ?>;
 	text-decoration:underline;
 }
+.login_block_elem a span.atoplogin, .login_block_elem span.atoplogin {
+    vertical-align: middle;
+}
 div.login_block_user {
 	display: inline-block;
 	padding-top: 3px;
@@ -5644,7 +5651,6 @@
 	div.login_block {
 		<?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 */
-		display: none;
 		padding-top: 20px;
 		padding-left: 20px;
     	padding-right: 20px;

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
@@ -1279,7 +1279,9 @@
 .login_block_getinfo .atoplogin, .login_block_getinfo .atoplogin:hover {
 	color: #333 !important;
 }
-
+.login_block_elem a span.atoplogin, .login_block_elem span.atoplogin {
+    vertical-align: middle;
+}