From 5cc2e853ca86107a61c13c57a52d61a3923cf8f3 Mon Sep 17 00:00:00 2001 From: Daniel Torres Date: Tue, 27 Dec 2016 17:05:07 -0200 Subject: [PATCH] fixup! [MIG] web_responsive: Migrate to v10 Scroll control panel with page using CSS instead of jQuery. jQuery scrolling caused scrollbar malfunction. --- web_responsive/static/src/js/web_responsive.js | 6 ------ web_responsive/static/src/less/main.less | 12 ++++++++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/web_responsive/static/src/js/web_responsive.js b/web_responsive/static/src/js/web_responsive.js index b1fcd143..5e2cd6e8 100755 --- a/web_responsive/static/src/js/web_responsive.js +++ b/web_responsive/static/src/js/web_responsive.js @@ -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); diff --git a/web_responsive/static/src/less/main.less b/web_responsive/static/src/less/main.less index 4f5a5f1a..c25b0bf1 100755 --- a/web_responsive/static/src/less/main.less +++ b/web_responsive/static/src/less/main.less @@ -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; + } + } + } +}