Browse Source

Merge pull request #511 from danieltorres7/web_responsive_scroll_controlpanel

Scroll control panel with page using CSS instead of jQuery.
pull/530/head
Dave Lasley 8 years ago
committed by GitHub
parent
commit
0c3db6320d
  1. 6
      web_responsive/static/src/js/web_responsive.js
  2. 12
      web_responsive/static/src/less/main.less

6
web_responsive/static/src/js/web_responsive.js

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

12
web_responsive/static/src/less/main.less

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