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

Merge remote-tracking branch 'upstream/develop' into 12.0_a18

Browse Source
This commit is contained in:
Alexandre SPANGARO 2020-03-01 05:06:52 +01:00
commit 8f3401896f
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/theme/md/dropdown.inc.php
View File

@ -7,6 +7,15 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
*/
button.dropdown-item.global-search-item {
outline: none;
}
.open>.dropdown-search, .open>.dropdown-bookmark, .open>.dropdown-menu, .dropdown dd ul.open {
display: block;
}
#topmenu-bookmark-dropdown a.login-dropdown-a {
color: #fff;
}

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

@ -1425,11 +1425,7 @@ body.sidebar-collapse .side-nav-vert, body.sidebar-collapse #id-right {
margin-left: 228px;
}
body.sidebar-collapse .side-nav, body.sidebar-collapse .login_block {
<?php if (in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
left: -240px;
<?php } else { ?>
left: -229px;
<?php } ?>
display: none;
}
<?php if (empty($conf->global->THEME_DISABLE_STICKY_TOPMENU)) { ?>
.side-nav-vert {