diff --git a/addons/point_of_sale/static/src/css/chrome50.css b/addons/point_of_sale/static/src/css/chrome50.css new file mode 100644 index 00000000000..67ecddccfde --- /dev/null +++ b/addons/point_of_sale/static/src/css/chrome50.css @@ -0,0 +1,6 @@ +.pos .screen .content-cell{ + height: 100%; +} +.pos .subwindow .subwindow-container{ + height: 100%; +} \ No newline at end of file diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 42372a7fb6f..26594dd7214 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -198,6 +198,9 @@ td { .pos .window .subwindow.collapsed{ height: 0px; } +.pos .window .subwindow-container .collapsed{ + height: 0px; +} .pos .subwindow .subwindow-container{ display: table-cell; position: relative; diff --git a/addons/point_of_sale/static/src/js/chrome.js b/addons/point_of_sale/static/src/js/chrome.js index f260dd03d71..926fe23eee7 100644 --- a/addons/point_of_sale/static/src/js/chrome.js +++ b/addons/point_of_sale/static/src/js/chrome.js @@ -6,6 +6,7 @@ var gui = require('point_of_sale.gui'); var keyboard = require('point_of_sale.keyboard'); var models = require('point_of_sale.models'); var core = require('web.core'); +var ajax = require('web.ajax'); var CrashManager = require('web.CrashManager'); @@ -478,6 +479,14 @@ var Chrome = PosBaseWidget.extend({ build_chrome: function() { var self = this; FastClick.attach(document.body); + + if ($.browser.chrome) { + var chrome_version = $.browser.version.split('.')[0]; + if (parseInt(chrome_version, 10) >= 50) { + ajax.loadCSS('/point_of_sale/static/src/css/chrome50.css'); + } + } + this.renderElement(); this.$('.pos-logo').click(function(){ diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 737d99c68c1..1f53f2b3ac0 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -437,7 +437,7 @@