From fabf9e97037d71f767e09fcc4f5aeffb2b71f05a Mon Sep 17 00:00:00 2001
From: "Antoine (anso)" <anso@odoo.com>
Date: Thu, 4 May 2023 09:48:12 +0000
Subject: [PATCH] [FIX] hr_{recruitment,skills},mass_mailing,project,note: milk
 adaptations

hr_recruitment: switch smart button value and label
- Switching applicant's name with "Employee" label to be consistent with
  the rest of smart button's format

mass_mailing: adapt status bar layout
- Removed excessive margin between the status bar and the content
- Added no padding between status bar and the control panel
- Removed a useless border before the status
- Improved margin between alert and buttons

project: right side panel stats buttons alignment

hr_skills: fix `::before` alignment

== ISSUE ==

Before this commit, the :before line in Employee resume is not aligned
with the dots. This is due to the fact that the variable
$o-hrs-timeline-entry-padding used in the mixin isn't the right value we
should use.

There was also an issue with responsive.

== After this commit ==

We now use a calc, which process the half of the circle plus the padding
minus the border-width. The $o-horizontal-padding is the variable used
to define the padding of the line inside the form view.

We adapt this in a smaller media query since the $o-horizontal-padding
value is different.

task-2818586

Part-of: odoo/odoo#116641
---
 addons/hr_recruitment/views/hr_applicant_views.xml     |  4 ++--
 .../hr_skills/static/src/fields/resume_one2many.scss   |  9 ++++++---
 addons/mass_mailing/static/src/scss/mass_mailing.scss  |  8 --------
 addons/mass_mailing/views/mailing_mailing_views.xml    |  4 ++--
 addons/note/static/src/scss/note.scss                  |  1 -
 addons/note/views/note_views.xml                       | 10 +++++++---
 .../project_right_side_panel.scss                      |  2 ++
 .../project_right_side_panel.xml                       |  2 +-
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/addons/hr_recruitment/views/hr_applicant_views.xml b/addons/hr_recruitment/views/hr_applicant_views.xml
index 1d940a6ca5e..62f7f6b106a 100644
--- a/addons/hr_recruitment/views/hr_applicant_views.xml
+++ b/addons/hr_recruitment/views/hr_applicant_views.xml
@@ -78,8 +78,8 @@
                             groups="hr.group_hr_user"
                             attrs="{'invisible': [('emp_id', '=', False)]}">
                         <div class="o_field_widget o_stat_info">
-                            <span class="o_stat_text"><field name="employee_name" readonly="1"/></span>
-                            <span class="o_stat_value">Employee</span>
+                            <span class="o_stat_value"><field name="employee_name" readonly="1"/></span>
+                            <span class="o_stat_text">Employee</span>
                         </div>
                     </button>
                     <button name="action_applications_email"
diff --git a/addons/hr_skills/static/src/fields/resume_one2many.scss b/addons/hr_skills/static/src/fields/resume_one2many.scss
index c681b80a0d3..9111ef65782 100644
--- a/addons/hr_skills/static/src/fields/resume_one2many.scss
+++ b/addons/hr_skills/static/src/fields/resume_one2many.scss
@@ -16,12 +16,15 @@
             }
 
             &:before {
-                @include o-position-absolute(0, $left: ($o-hrs-timeline-dot-size * .5 + $o-hrs-timeline-entry-padding));
-                width: 1px;
+                @include o-position-absolute(0, $left: ($o-hrs-timeline-dot-size * .5 + o-to-rem($o-horizontal-padding) - o-to-rem($border-width)));
+                width: $border-width;
                 height: 100%;
-                margin-left: 2.1rem;
                 background-color: $border-color;
                 content: "";
+
+                @include media-breakpoint-up(lg, $o-extra-grid-breakpoints) {
+                    left: ($o-hrs-timeline-dot-size * .5 + o-to-rem($o-horizontal-padding) * 2 - o-to-rem($border-width))
+                }
             }
         }
     }
diff --git a/addons/mass_mailing/static/src/scss/mass_mailing.scss b/addons/mass_mailing/static/src/scss/mass_mailing.scss
index 8e179d86382..9c213709396 100644
--- a/addons/mass_mailing/static/src/scss/mass_mailing.scss
+++ b/addons/mass_mailing/static/src/scss/mass_mailing.scss
@@ -27,13 +27,6 @@
         .o_statusbar_buttons {
             flex-grow: 1;
         }
-
-        .o_statusbar_status {
-            border-left: solid $o-gray-300 1px;
-        }
-    }
-    .o_mass_mailing_mailing_group {
-        margin-top: $o-sheet-cancel-tpadding + 33px;
     }
     .o-mail-Form-chatter {
         margin: 0;
@@ -183,7 +176,6 @@
 }
 
 .o_mass_mailing_mailing_form.o_mass_mailing_form_full_width .alert.alert-info:not(.o_invisible_modifier) {
-    margin: 0 0 0 12px;
     flex: 1;
     padding: unset;
     border-left-width: 1px;
diff --git a/addons/mass_mailing/views/mailing_mailing_views.xml b/addons/mass_mailing/views/mailing_mailing_views.xml
index cba8755af9a..d4f61d410fe 100644
--- a/addons/mass_mailing/views/mailing_mailing_views.xml
+++ b/addons/mass_mailing/views/mailing_mailing_views.xml
@@ -58,7 +58,7 @@
             <field name="model">mailing.mailing</field>
             <field name="arch" type="xml">
                 <form string="Mailing" class="o_mass_mailing_mailing_form">
-                    <header style="min-height:31px;">
+                    <header class="pt-3">
                         <button name="action_launch" type="object" class="oe_highlight" string="Send"
                             attrs="{'invisible': [('state', 'in', ('in_queue',  'sending', 'done'))]}" data-hotkey="v"
                             confirm="This will send the email to all recipients. Are you sure you want to proceed?"
@@ -74,7 +74,7 @@
 
                         <field name="state" readonly="1" widget="statusbar"/>
                     </header>
-                    <div class="alert alert-info text-center" role="alert"
+                    <div class="alert alert-info mb-2 text-center" role="alert"
                         attrs="{'invisible': ['&amp;','&amp;','&amp;','&amp;','&amp;',('state', '!=', 'in_queue'),('sent', '=', 0),('canceled', '=', 0),('scheduled', '=', 0),('failed', '=', 0),('warning_message', '=', False)]}">
                         <div class="o_mails_canceled" attrs="{'invisible': [('canceled', '=', 0)]}">
                             <button class="btn-link py-0"
diff --git a/addons/note/static/src/scss/note.scss b/addons/note/static/src/scss/note.scss
index bdb4c031b46..840f558c27e 100644
--- a/addons/note/static/src/scss/note.scss
+++ b/addons/note/static/src/scss/note.scss
@@ -7,7 +7,6 @@
     .o_form_sheet_bg {
         display: flex;
         flex-direction: column;
-        padding: 0;
         .o_form_statusbar {
             margin: 0;
         }
diff --git a/addons/note/views/note_views.xml b/addons/note/views/note_views.xml
index 26aa5fa6b93..582cdb628a5 100644
--- a/addons/note/views/note_views.xml
+++ b/addons/note/views/note_views.xml
@@ -163,9 +163,13 @@
         <field name="arch" type="xml">
             <form string="Note" class="o_note_form_view">
                 <header>
-                    <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" placeholder="Tags"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" options="{'clickable': '1'}"/>
+                  <div class="py-1 px-2 border rounded bg-view">
+                    <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}" placeholder="Tags" class="mb-0"/>
+                  </div>
+                  <div class="py-1 px-2 border rounded bg-view">
+                    <field name="company_id" groups="base.group_multi_company" class="mb-0"/>
+                  </div>
+                  <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" options="{'clickable': '1'}"/>
                 </header>
                 <sheet>
                     <field name="memo" type="html" class="oe_memo" default_focus="1" options="{'resizable': false, 'collaborative': true}"/>
diff --git a/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.scss b/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.scss
index 67a50c78b92..6d8dc794341 100644
--- a/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.scss
+++ b/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.scss
@@ -37,9 +37,11 @@ $o-rightpanel-p-tiny: $o-rightpanel-p-small*0.5;
         .o_form_view {
             .oe_button_box {
                 margin: -1px (-$o-rightpanel-p) 0;
+                box-shadow: inset 0 -1px 0 $border-color;
 
                 .oe_stat_button {
                     flex-basis: 25%;
+                    margin: 0;
 
                     &:nth-child(4n):not(:last-child) {
                         border-right-width: 0;
diff --git a/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.xml b/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.xml
index e6e772049b5..2b6b130ead8 100644
--- a/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.xml
+++ b/addons/project/static/src/components/project_right_side_panel/project_right_side_panel.xml
@@ -14,7 +14,7 @@
                             <ViewButton
                                 t-if="button.show"
                                 defaultRank="'oe_stat_button'"
-                                className="'h-auto py-2 border border-start-0 border-top-0 text-start'"
+                                className="'flex-grow-0 h-auto py-2 border border-start-0 border-top-0 text-start rounded-0'"
                                 icon="`fa-${button.icon}`"
                                 title="button.text"
                                 clickParams="_getStatButtonClickParams(button)"