Merge pull request #511 from danieltorres7/web_responsive_scroll_controlpanel

Scroll control panel with page using CSS instead of jQuery.
This commit is contained in:
Dave Lasley
2016-12-27 12:09:42 -08:00
committed by GitHub
2 changed files with 12 additions and 6 deletions

View File

@@ -88,12 +88,6 @@ odoo.define('web_responsive', function(require) {
'a.oe_logo, ' +
'i.oe_logo_edit'
);
$('.o_content').scroll(function() {
$('.o_control_panel').css(
'margin-top',
-$(this).scrollTop() + 'px'
);
});
$clickZones.click($.proxy(this.handleClickZones, this));
core.bus.on('resize', this, this.handleWindowResize);
core.bus.on('keydown', this, this.handleNavKeys);

View File

@@ -44,3 +44,15 @@ main {
.o_tooltip.active {
z-index: 1051;
}
.o_web_client {
>.o_main {
overflow: auto;
> .o_main_content {
overflow: initial;
> .o_content {
overflow: initial;
}
}
}
}