[MERGE] forward port of branch 8.0 up to 9fa53b7

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 42e594aaaf8..cb9aa0b553c 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1407,6 +1407,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;