From 08743cded7ca6287f0fa1de69e0086e7eb8cf1c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Sun, 1 Feb 2015 21:06:59 +0100 Subject: [PATCH] [IMP] pos_restaurant: full screen floor plan on all devices --- .../static/src/css/restaurant.css | 28 ++++++++----------- addons/pos_restaurant/static/src/js/floors.js | 4 +-- .../pos_restaurant/static/src/xml/floors.xml | 1 + 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/addons/pos_restaurant/static/src/css/restaurant.css b/addons/pos_restaurant/static/src/css/restaurant.css index d148c5b2a77..ec6c2f2f365 100644 --- a/addons/pos_restaurant/static/src/css/restaurant.css +++ b/addons/pos_restaurant/static/src/css/restaurant.css @@ -2,7 +2,6 @@ .screen .screen-content-flexbox { margin: 0px auto; - max-width: 1024px; text-align: left; height: 100%; overflow: hidden; @@ -52,23 +51,18 @@ transition: all 300ms ease-in-out; } +.floor-map .tables { + position: relative; +} @media screen and (min-width: 1024px) { - .floor-map { - margin: 8px; - border-radius: 3px; - } - .floor-selector { - margin: 8px; - margin-bottom: 0; - box-sizing: border-box; - width: auto; - border: none; - } - .floor-selector .button { - border-left: none; - } - .floor-selector .button.active{ - border-radius: 3px; + .floor-map .tables { + max-width: 1024px; + margin: auto; + max-height: 540px; + border-radius: 0px 0px 6px 6px; + border: dashed 2px rgba(0,0,0,0.1); + border-top: none; + height: 100%; } } diff --git a/addons/pos_restaurant/static/src/js/floors.js b/addons/pos_restaurant/static/src/js/floors.js index fe13ed552c9..4cd8234ae0f 100644 --- a/addons/pos_restaurant/static/src/js/floors.js +++ b/addons/pos_restaurant/static/src/js/floors.js @@ -491,7 +491,7 @@ openerp.pos_restaurant.load_floors = function(instance,module){ this.floor.tables.push(table); var tw = new module.TableWidget(this,{table: table}); - tw.appendTo('.floor-map'); + tw.appendTo('.floor-map .tables'); this.table_widgets.push(tw); return tw; }, @@ -556,7 +556,7 @@ openerp.pos_restaurant.load_floors = function(instance,module){ var tw = new module.TableWidget(this,{ table: this.floor.tables[i], }); - tw.appendTo(this.$('.floor-map')); + tw.appendTo(this.$('.floor-map .tables')); this.table_widgets.push(tw); } diff --git a/addons/pos_restaurant/static/src/xml/floors.xml b/addons/pos_restaurant/static/src/xml/floors.xml index 4406fc58749..63a5574291e 100644 --- a/addons/pos_restaurant/static/src/xml/floors.xml +++ b/addons/pos_restaurant/static/src/xml/floors.xml @@ -87,6 +87,7 @@
+