[MERGE] forward port branch saas-12.4 up to fe59754c520

closes odoo/odoo#36721

Signed-off-by: Christophe Simonis <chs@odoo.com>

1 files changed, 17 insertions, 4 deletions

diff --git a/addons/point_of_sale/static/src/css/customer_facing_display.css b/addons/point_of_sale/static/src/css/customer_facing_display.css
index d9be0c89c35..bb699672ad8 100644
--- a/addons/point_of_sale/static/src/css/customer_facing_display.css
+++ b/addons/point_of_sale/static/src/css/customer_facing_display.css
@@ -122,8 +122,7 @@ body .pos-customer_facing_display .pos_orderlines .pos_orderlines_item.pos_order
   box-shadow: none;
   animation: none;
 }
-body .pos-customer_facing_display .pos_orderlines .pos_orderlines_item.pos_orderlines_header > div,
-body .pos-customer_facing_display .pos_orderlines .pos_orderlines_item.pos_orderlines_header > div:last-child {
+body .pos-customer_facing_display .pos_orderlines .pos_orderlines_item.pos_orderlines_header > div, body .pos-customer_facing_display .pos_orderlines .pos_orderlines_item.pos_orderlines_header > div:last-child {
   border-left-width: 0;
   text-align: center;
   font-size: 70%;
@@ -423,7 +422,7 @@ body .pos-customer_facing_display .pos-payment_info .pos-payment_info_details .p
     text-align: center;
   }
   body .pos-customer_facing_display .pos-payment_info .pos-company_logo {
-    display: none!important;
+    display: none !important;
   }
   body .pos-customer_facing_display .pos-payment_info .pos-payment_info_details {
     -webkit-box-flex: 1 0 100%;
@@ -439,6 +438,7 @@ body .pos-customer_facing_display .pos-payment_info .pos-payment_info_details .p
     font-size: 6.5vw;
   }
 }
+
 body .pos-hidden {
   opacity: 0;
 }
@@ -460,7 +460,7 @@ body.editor_enable #oe_manipulators .oe_overlay > .oe_overlay_options > .btn-gro
 }
 body.editor_enable #oe_manipulators .oe_overlay > .oe_overlay_options > .btn-group > .dropdown.oe_options.btn-group.snippet-option-pos_palette > .dropdown-menu > a {
   position: relative;
-  padding: 14px 0!important;
+  padding: 14px 0 !important;
   margin-bottom: 1px;
 }
 body.editor_enable #oe_manipulators .oe_overlay > .oe_overlay_options > .btn-group > .dropdown.oe_options.btn-group.snippet-option-pos_palette > .dropdown-menu > a:before {
@@ -470,6 +470,7 @@ body.editor_enable #oe_manipulators .no_parent_options .snippet-option-pos_palet
 body.editor_enable #oe_manipulators .no_parent_options .o_parent_editor_header {
   display: none;
 }
+
 .pos-palette_01 .pos-payment_info {
   background: #3E3E3E;
   color: #f6f6f6;
@@ -506,6 +507,7 @@ body.editor_enable #oe_manipulators .no_parent_options .o_parent_editor_header {
 #oe_manipulators .oe_overlay > .oe_overlay_options .snippet-option-pos_palette > .dropdown-menu > .pos-palette_01:before {
   text-shadow: 0 0 1px #090909;
 }
+
 .pos-palette_02 .pos-payment_info {
   background: #364152;
   color: #e6e7e8;
@@ -542,6 +544,7 @@ body.editor_enable #oe_manipulators .no_parent_options .o_parent_editor_header {
 #oe_manipulators .oe_overlay > .oe_overlay_options .snippet-option-pos_palette > .dropdown-menu > .pos-palette_02:before {
   text-shadow: 0 0 1px #130d09;
 }
+
 .pos-palette_03 .pos-payment_info {
   background: #1BA39C;
   color: #f6f6f6;
@@ -578,6 +581,7 @@ body.editor_enable #oe_manipulators .no_parent_options .o_parent_editor_header {
 #oe_manipulators .oe_overlay > .oe_overlay_options .snippet-option-pos_palette > .dropdown-menu > .pos-palette_03:before {
   text-shadow: 0 0 1px #131313;
 }
+
 .pos-palette_04 .pos-payment_info {
   background: #0b7b6c;
   color: #f6f6f6;
@@ -614,6 +618,7 @@ body.editor_enable #oe_manipulators .no_parent_options .o_parent_editor_header {
 #oe_manipulators .oe_overlay > .oe_overlay_options .snippet-option-pos_palette > .dropdown-menu > .pos-palette_04:before {
   text-shadow: 0 0 1px #101113;
 }
+
 .pos-palette_05 .pos-payment_info {
   background: #E26868;
   color: #f6f6f6;
@@ -650,6 +655,7 @@ body.editor_enable #oe_manipulators .no_parent_options .o_parent_editor_header {
 #oe_manipulators .oe_overlay > .oe_overlay_options .snippet-option-pos_palette > .dropdown-menu > .pos-palette_05:before {
   text-shadow: 0 0 1px #131313;
 }
+
 .pos-palette_06 .pos-payment_info {
   background: #9E373B;
   color: #f6f6f6;
@@ -686,6 +692,7 @@ body.editor_enable #oe_manipulators .no_parent_options .o_parent_editor_header {
 #oe_manipulators .oe_overlay > .oe_overlay_options .snippet-option-pos_palette > .dropdown-menu > .pos-palette_06:before {
   text-shadow: 0 0 1px #090909;
 }
+
 .pos-palette_07 .pos-payment_info {
   background: #ce9934;
   color: white;
@@ -722,6 +729,7 @@ body.editor_enable #oe_manipulators .no_parent_options .o_parent_editor_header {
 #oe_manipulators .oe_overlay > .oe_overlay_options .snippet-option-pos_palette > .dropdown-menu > .pos-palette_07:before {
   text-shadow: 0 0 1px #131313;
 }
+
 .pos-palette_08 .pos-payment_info {
   background: #a48c77;
   color: #f6f6f6;
@@ -758,6 +766,7 @@ body.editor_enable #oe_manipulators .no_parent_options .o_parent_editor_header {
 #oe_manipulators .oe_overlay > .oe_overlay_options .snippet-option-pos_palette > .dropdown-menu > .pos-palette_08:before {
   text-shadow: 0 0 1px #131313;
 }
+
 .pos-palette_09 .pos-payment_info {
   background: linear-gradient(30deg, #014d43, #127e71);
   color: #f6f6f6;
@@ -794,6 +803,7 @@ body.editor_enable #oe_manipulators .no_parent_options .o_parent_editor_header {
 #oe_manipulators .oe_overlay > .oe_overlay_options .snippet-option-pos_palette > .dropdown-menu > .pos-palette_09:before {
   text-shadow: 0 0 1px #131313;
 }
+
 .pos-palette_10 .pos-payment_info {
   background: linear-gradient(30deg, #e2316c, #ea4c89);
   color: white;
@@ -830,6 +840,7 @@ body.editor_enable #oe_manipulators .no_parent_options .o_parent_editor_header {
 #oe_manipulators .oe_overlay > .oe_overlay_options .snippet-option-pos_palette > .dropdown-menu > .pos-palette_10:before {
   text-shadow: 0 0 1px #131313;
 }
+
 .pos-palette_11 .pos-payment_info {
   background: linear-gradient(30deg, #362b3d, #5b4a63);
   color: white;
@@ -866,6 +877,7 @@ body.editor_enable #oe_manipulators .no_parent_options .o_parent_editor_header {
 #oe_manipulators .oe_overlay > .oe_overlay_options .snippet-option-pos_palette > .dropdown-menu > .pos-palette_11:before {
   text-shadow: 0 0 1px #131313;
 }
+
 .pos-palette_12 .pos-payment_info {
   background: #434343;
   color: #e6e6e6;
@@ -902,6 +914,7 @@ body.editor_enable #oe_manipulators .no_parent_options .o_parent_editor_header {
 #oe_manipulators .oe_overlay > .oe_overlay_options .snippet-option-pos_palette > .dropdown-menu > .pos-palette_12:before {
   text-shadow: 0 0 1px #a4a4a4;
 }
+
 .pos-palette_13 .pos-payment_info {
   background: linear-gradient(30deg, #1a1b1f, #3d3f45);
   color: white;