Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix decoration

Browse Source
This commit is contained in:
John BOTELLA
2019-03-12 16:43:09 +01:00
parent d62db95803
commit 4495f0a755
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/main.inc.php
View File

@@ -1594,7 +1594,10 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
} }
} }
print '<div class="login_block">'."\n"; $loginBlockMoreClass = '';
if(!empty($conf->global->MAIN_TOP_MENU_DROPDOWN)){ $loginBlockMoreClass = 'usedropdown'; }
print '<div class="login_block '.$loginBlockMoreClass.'">'."\n";
// Add login user link // Add login user link
$toprightmenu.='<div class="login_block_user">'; $toprightmenu.='<div class="login_block_user">';
@@ -1701,8 +1704,9 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
} }
} }
// Logout link // Logout link
$toprightmenu.=@Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem', 2); $toprightmenu.=@Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem logout-btn', 2);
$toprightmenu.='</div>'; $toprightmenu.='</div>';

6
htdocs/theme/eldy/dropdown.css.php
View File

@@ -42,6 +42,9 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
/* /*
* MENU Dropdown * MENU Dropdown
*/ */
.login_block.usedropdown .logout-btn{
display: none;
}
.tmenu .open.dropdown, .login_block .open.dropdown, .tmenu .open.dropdown, .login_block .dropdown:hover{ .tmenu .open.dropdown, .login_block .open.dropdown, .tmenu .open.dropdown, .login_block .dropdown:hover{
background: rgba(0, 0, 0, 0.1); background: rgba(0, 0, 0, 0.1);
@@ -114,6 +117,9 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
#topmenu-login-dropdown{ #topmenu-login-dropdown{
padding: 0 5px 0 5px; padding: 0 5px 0 5px;
} }
#topmenu-login-dropdown a:hover{
text-decoration: none;
}
#topmenuloginmoreinfo-btn{ #topmenuloginmoreinfo-btn{
display: block; display: block;