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

Fix sidebar collapse behavior

Browse Source
This commit is contained in:
John BOTELLA 2019-03-08 14:06:37 +01:00
parent 1127716abf
commit 56a40c7de8
3 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/main.inc.php
View File

@ -1095,6 +1095,10 @@ if (! function_exists("llxHeader"))
// html header // html header
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
if ($conf->browser->layout == 'phone'){
$morecssonbody.= ' sidebar-collapse';
}
print '<body id="mainbody"'.($morecssonbody?' class="'.$morecssonbody.'"':'').'>' . "\n"; print '<body id="mainbody"'.($morecssonbody?' class="'.$morecssonbody.'"':'').'>' . "\n";
// top menu and left menu area // top menu and left menu area

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

@ -1220,6 +1220,7 @@ td.showDragHandle {
border-right: 1px solid #d0d0d0; border-right: 1px solid #d0d0d0;
box-shadow: 3px 0 6px -2px #eee; box-shadow: 3px 0 6px -2px #eee;
background: rgb(<?php echo $colorbackvmenu1; ?>); background: rgb(<?php echo $colorbackvmenu1; ?>);
transition: left 0.5s ease;
} }
body.sidebar-collapse .side-nav { body.sidebar-collapse .side-nav {
@ -1268,11 +1269,8 @@ div.vmenu, td.vmenu {
background: #FFF; background: #FFF;
padding-left: 20px; padding-left: 20px;
padding-right: 20px; padding-right: 20px;
}
.side-nav {
position: absolute; position: absolute;
z-index: 90; z-index: 90;
display: none;
} }
div.blockvmenulogo div.blockvmenulogo
{ {

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

@ -1210,9 +1210,33 @@ td.showDragHandle {
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
} }
/*
* Slide animation
*/
.side-nav-vert, #id-right {
transition: padding-left 0.5s ease, margin-left 0.5s ease;
}
.side-nav, .login_block {
transition: left 0.5s ease;
}
body.sidebar-collapse .side-nav-vert, body.sidebar-collapse #id-right {
margin-left: 0;padding-left:0
}
.side-nav-vert { .side-nav-vert {
margin-left: 228px; margin-left: 228px;
} }
body.sidebar-collapse .side-nav, body.sidebar-collapse .login_block {
<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
left: -240px;
<?php } else { ?>
left: -229px;
<?php } ?>
}
<?php if (empty($conf->global->THEME_DISABLE_STICKY_TOPMENU)) { ?> <?php if (empty($conf->global->THEME_DISABLE_STICKY_TOPMENU)) { ?>
.side-nav-vert { .side-nav-vert {
position: sticky; position: sticky;
@ -1239,11 +1263,9 @@ div.login_block {
overflow-x: initial !important; overflow-x: initial !important;
overflow-y: scroll; overflow-y: scroll;
<?php } ?> <?php } ?>
display: none; display: block;
position: auto; position: relative;
top: auto;
z-index: 90;
} }
@ -1260,7 +1282,7 @@ div.backgroundsemitransparent {
div.login_block { div.login_block {
/* position: initial !important;*/ /* position: initial !important;*/
display: none; /*display: none;*/
} }
.login_block_getinfo { .login_block_getinfo {
text-align: center; text-align: center;
@ -5718,27 +5740,6 @@ border-top-right-radius: 6px;
} }
/*
* Slide animation
*/
.side-nav-vert, #id-right {
transition: padding-left 0.5s ease, margin-left 0.5s ease;
}
.side-nav, .login_block {
transition: left 0.5s ease;
}
body.sidebar-collapse .side-nav, body.sidebar-collapse .login_block {
left: -228px;
}
body.sidebar-collapse .side-nav-vert, body.sidebar-collapse #id-right {
margin-left: 0;padding-left:0
}
<?php <?php
if (is_object($db)) $db->close(); if (is_object($db)) $db->close();