diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-03-18 10:20:06 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-03-18 10:20:06 +0100 |
| commit | 5162ca7be7dbc994d60fbcbf080ff09f9fa12bc0 (patch) | |
| tree | a3e4086bbcee294fa5c3ddaf813c555892f7069f /addons/hw_screen | |
| parent | d5a8b238fac3c7920c034e4be5fc86347d5eea50 (diff) | |
| parent | 36ba37a7a1c959550f5688cc69c4e7a3abd9d02a (diff) | |
[MERGE] forward port branch 10.0 up to 36ba37a7a1c
Diffstat (limited to 'addons/hw_screen')
| -rw-r--r-- | addons/hw_screen/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/hw_screen/static/src/js/worker.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/hw_screen/controllers/main.py b/addons/hw_screen/controllers/main.py index 565bdbe02a3..a74662009b5 100644 --- a/addons/hw_screen/controllers/main.py +++ b/addons/hw_screen/controllers/main.py @@ -150,7 +150,7 @@ class HardwareScreen(web.Home): </head> <body class="original_body"> <div hidden class="shadow"></div> - <div class="container"> + <div class="container-fluid"> <div class="row"> <div class="col-md-4 col-md-offset-4"> <h1>Odoo Point of Sale</h1> diff --git a/addons/hw_screen/static/src/js/worker.js b/addons/hw_screen/static/src/js/worker.js index 55e389e78ab..b67d611c4ca 100644 --- a/addons/hw_screen/static/src/js/worker.js +++ b/addons/hw_screen/static/src/js/worker.js @@ -32,8 +32,8 @@ $("head").append($parsedHTML.find(".resources").html()); } - $(".container").html($parsedHTML.find('.pos-customer_facing_display').html()); - $(".container").attr('class', 'container').addClass($parsedHTML.find('.pos-customer_facing_display').attr('class')); + $(".container-fluid").html($parsedHTML.find('.pos-customer_facing_display').html()); + $(".container-fluid").attr('class', 'container-fluid').addClass($parsedHTML.find('.pos-customer_facing_display').attr('class')); var d = $('.pos_orderlines_list'); d.scrollTop(d.prop("scrollHeight")); |