From 8a2875bb3827d3873c5b2c9aa2b28b54baae8352 Mon Sep 17 00:00:00 2001
From: Brieuc-brd <brd@odoo.com>
Date: Mon, 8 May 2023 14:11:51 +0000
Subject: [PATCH] [IMP] delivery, sale_loyalty, project: adapt for milk

This commit adapts the spacing between the buttons in the
sale_order_views to fit with Milk.

project: layout fixes:
- Fixed kog displaying on top of the project status button
- Fixed the flickering in project updates when selecting rows in list
view

task-2818586

Part-of: odoo/odoo#116641
---
 addons/delivery/views/sale_order_views.xml                    | 2 +-
 .../project_control_panel/project_control_panel.xml           | 4 ++--
 addons/sale_loyalty/views/sale_order_views.xml                | 2 +-
 addons/web/static/src/search/cog_menu/cog_menu.xml            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/delivery/views/sale_order_views.xml b/addons/delivery/views/sale_order_views.xml
index f370e1aae2f..d21e76133c6 100644
--- a/addons/delivery/views/sale_order_views.xml
+++ b/addons/delivery/views/sale_order_views.xml
@@ -12,7 +12,7 @@
                 <field name="recompute_delivery_price" invisible="1"/>
             </field>
             <group name="note_group" position="before">
-                <div class="oe_right">
+                <div class="oe_right mb-2 ms-1">
                     <button
                         string="Add shipping"
                         name="action_open_delivery_wizard"
diff --git a/addons/project/static/src/components/project_control_panel/project_control_panel.xml b/addons/project/static/src/components/project_control_panel/project_control_panel.xml
index e722be06f8b..b38d58e35c8 100644
--- a/addons/project/static/src/components/project_control_panel/project_control_panel.xml
+++ b/addons/project/static/src/components/project_control_panel/project_control_panel.xml
@@ -10,10 +10,10 @@
 
     <t t-name="project.ProjectControlPanelContent" owl="1">
         <t t-if="showProjectUpdate">
-            <div t-if="isProjectUser" class="o_project_updates_breadcrumb" t-on-click="onStatusClick">
+            <div t-if="isProjectUser" class="o_project_updates_breadcrumb z-index-1" t-on-click="onStatusClick">
                 <t t-call="project.ProjectControlPanelContentBadge"></t>
             </div>
-            <div t-else="" class="o_project_updates_breadcrumb">
+            <div t-else="" class="o_project_updates_breadcrumb z-index-1">
                 <t t-call="project.ProjectControlPanelContentBadge"></t>
             </div>
         </t>
diff --git a/addons/sale_loyalty/views/sale_order_views.xml b/addons/sale_loyalty/views/sale_order_views.xml
index 2e88bf40dd9..88ebb18fd9d 100644
--- a/addons/sale_loyalty/views/sale_order_views.xml
+++ b/addons/sale_loyalty/views/sale_order_views.xml
@@ -8,7 +8,7 @@
         <field name="priority">10</field>
         <field name="arch" type="xml">
             <group name="note_group" position="before">
-                <div class="oe_right">
+                <div class="oe_right d-flex gap-1 mb-2 ms-1">
                     <button name="%(sale_loyalty.sale_loyalty_coupon_wizard_action)d" class="btn btn-secondary"
                         string="Coupon Code" type="action" states="draft,sent,sale"/>
                     <button name="action_open_reward_wizard" class="btn btn-secondary"
diff --git a/addons/web/static/src/search/cog_menu/cog_menu.xml b/addons/web/static/src/search/cog_menu/cog_menu.xml
index f838e0f758b..6fa1fff0a94 100644
--- a/addons/web/static/src/search/cog_menu/cog_menu.xml
+++ b/addons/web/static/src/search/cog_menu/cog_menu.xml
@@ -3,7 +3,7 @@
 
     <t t-name="web.CogMenu" owl="1">
         <div t-if="hasItems" class="o_cp_action_menus d-flex align-items-center pe-2 gap-1">
-            <Dropdown class="'lh-1'" togglerClass="'d-print-none btn p-0 ms-1 lh-sm'" menuClass="'lh-base'">
+            <Dropdown class="'lh-1'" togglerClass="'d-print-none btn p-0 ms-1 lh-sm border-0'" menuClass="'lh-base'">
                 <t t-set-slot="toggler">
                     <i class="fa fa-cog"/>
                 </t>