From 9ef5e01596e76f4d6de06cfb9213eedbf35af4cd Mon Sep 17 00:00:00 2001 From: Brieuc-brd Date: Mon, 15 May 2023 08:18:55 +0000 Subject: [PATCH] [FIX] point_of_sale: directional icons Prior to this commit, the new directional icons introduced with Milk were not called and broke the layout. This commit fixes this issue. task-3326366 Part of task-3326263 closes odoo/odoo#121947 X-original-commit: 36345ad7c1179ab3f2db797917e9ff3ecda51dfb Related: odoo/enterprise#41290 Signed-off-by: Joseph Caburnay (jcb) --- addons/point_of_sale/__manifest__.py | 1 + addons/point_of_sale/static/src/scss/pos.scss | 10 +++------- .../ProductScreen/ProductsWidgetControlPanel.xml | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/addons/point_of_sale/__manifest__.py b/addons/point_of_sale/__manifest__.py index d6a601f0764..cd0b09b7bfd 100644 --- a/addons/point_of_sale/__manifest__.py +++ b/addons/point_of_sale/__manifest__.py @@ -84,6 +84,7 @@ 'web/static/lib/bootstrap/scss/_variables.scss', 'web/static/fonts/fonts.scss', 'web/static/src/libs/fontawesome/css/font-awesome.css', + 'web/static/lib/odoo_ui_icons/*', 'web/static/src/legacy/scss/fontawesome_overridden.scss', # JS framework 'web/static/src/boot.js', diff --git a/addons/point_of_sale/static/src/scss/pos.scss b/addons/point_of_sale/static/src/scss/pos.scss index 9570a513359..859dcdd6186 100644 --- a/addons/point_of_sale/static/src/scss/pos.scss +++ b/addons/point_of_sale/static/src/scss/pos.scss @@ -689,19 +689,16 @@ td { .pos .button.validation .pay-circle { display: block; font-size: 32px; - line-height: var(--btn-height-size); - padding-top: 6px; background: $gray-900; color: white; - width: 60px; text-align: center; border-radius: 30px; margin-bottom: 10px; } -.pos .button.validation .pay-circle .fa { +.pos .button.validation .pay-circle .oi { position: relative; - top: -1px; - left: 3px; + display: block; + padding: 14px; } .pos .actionpad .button.set-partner{ @@ -3386,7 +3383,6 @@ td { .ticket-screen .pos-search-bar .filter .down-icon { position: absolute; right: 13px; - top: 12px; } .ticket-screen .pos-search-bar .filter { diff --git a/addons/point_of_sale/static/src/xml/Screens/ProductScreen/ProductsWidgetControlPanel.xml b/addons/point_of_sale/static/src/xml/Screens/ProductScreen/ProductsWidgetControlPanel.xml index 5fdea562898..611ec60ae42 100644 --- a/addons/point_of_sale/static/src/xml/Screens/ProductScreen/ProductsWidgetControlPanel.xml +++ b/addons/point_of_sale/static/src/xml/Screens/ProductScreen/ProductsWidgetControlPanel.xml @@ -6,7 +6,7 @@
- +