From 7033a97f7703dc212f220b1c4d5a1236caab1654 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 19 Apr 2016 11:44:48 +0200 Subject: [PATCH] Revert "[FIX] web: fix layout issue in Chrome 50" This reverts commit f992c8ee192c075b38bf14dd5dcfb10fba7dd2ef which should not be forward-ported. --- addons/web/static/src/css/chrome50.css | 8 -------- addons/web/static/src/js/chrome.js | 8 -------- 2 files changed, 16 deletions(-) delete mode 100644 addons/web/static/src/css/chrome50.css diff --git a/addons/web/static/src/css/chrome50.css b/addons/web/static/src/css/chrome50.css deleted file mode 100644 index cfcf6d84033..00000000000 --- a/addons/web/static/src/css/chrome50.css +++ /dev/null @@ -1,8 +0,0 @@ -/* Do not forward port! */ -.oe_leftbar > div > div > div { - display: table-cell; -} - -.oe_view_manager > .oe_view_manager_wrapper > div { - display: table-cell; -} diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index cb9aa0b553c..42e594aaaf8 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1407,14 +1407,6 @@ instance.web.WebClient = instance.web.Client.extend({ self.action_manager.do_action(self.client_options.action_post_login); delete(self.client_options.action_post_login); } - - /* Do not forward port! */ - if ($.browser.chrome) { - var chrome_version = $.browser.version.split('.')[0]; - if (parseInt(chrome_version, 10) >= 50) { - openerp.loadCSS('/web/static/src/css/chrome50.css'); - } - } }, update_logo: function() { var company = this.session.company_id;