summaryrefslogtreecommitdiff
path: root/addons/web
diff options
context:
space:
mode:
authorSimon Lejeune <sle@openerp.com>2016-04-18 12:23:39 +0200
committerSimon Lejeune <sle@openerp.com>2016-04-18 14:43:50 +0200
commitf992c8ee192c075b38bf14dd5dcfb10fba7dd2ef (patch)
tree7a2d71771738a9b3fcdfd047f0be591d3d797df9 /addons/web
parente1a99192bda1019a50be879cb0baaa72d447956a (diff)
[FIX] web: fix layout issue in Chrome 50
A 100% height is not distributed anymore to the children of a table-row if they are not themselves table-cell in Chrome 50. This breaks the indenpendent scrolling of the menu and the view manager. However, setting the `table-cell` display breaks the layout in Internet Explorer. When the webclient is loaded by Chrome 50, we load a stylesheet forcing a `table-cell` for display. Seems to be related to https://bugs.chromium.org/p/chromium/issues/detail?id=353580 and https://chromium.googlesource.com/chromium/src.git/+/8876584335b48c99cf8df552ef4d8efebb131041 Related to e1a99192bda1019a50be879cb0baaa72d447956a Fixes #11629
Diffstat (limited to 'addons/web')
-rw-r--r--addons/web/static/src/css/chrome50.css8
-rw-r--r--addons/web/static/src/js/chrome.js8
2 files changed, 16 insertions, 0 deletions
diff --git a/addons/web/static/src/css/chrome50.css b/addons/web/static/src/css/chrome50.css
new file mode 100644
index 00000000000..cfcf6d84033
--- /dev/null
+++ b/addons/web/static/src/css/chrome50.css
@@ -0,0 +1,8 @@
+/* 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 83c2ea63dae..34a9f15cb00 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1292,6 +1292,14 @@ 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;