From 574a5a2f481fc714f2d7df4bf659ef1999c3a100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20K=C3=BChn?= <aku@odoo.com>
Date: Fri, 30 Jun 2023 10:19:44 +0000
Subject: [PATCH] [FIX] mail: fix project invite button alignment in chatter
 message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This happens because last `<p>` of message was always `inline-block`
to properly position "(edited)". However, this was breaking some
non-editable content that relies on `<p>` default displays (`block`).

This commit fixes the issue by only inlining the last `<p>` of
an edited message. Non-edited message keeps the default styling of
`<p>`.

Also slightly improve alignment of edited on empty body messages.

Related to Task-3374747

closes odoo/odoo#126988

X-original-commit: 92b359347fc3e390a75ef7a27a9fa758a21673dc
Signed-off-by: Matthieu Stockbauer (tsm) <tsm@odoo.com>
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 addons/mail/static/src/core/common/message.scss | 2 +-
 addons/mail/static/src/core/common/message.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/core/common/message.scss b/addons/mail/static/src/core/common/message.scss
index b3322222861..8077c7d1417 100644
--- a/addons/mail/static/src/core/common/message.scss
+++ b/addons/mail/static/src/core/common/message.scss
@@ -23,7 +23,7 @@
 .o-mail-Message-body > p {
     margin-bottom: 0;
 
-    &:last-of-type {
+    &:last-of-type:has(~ .o-mail-Message-edited) {
         display: inline-block;
     }
 }
diff --git a/addons/mail/static/src/core/common/message.xml b/addons/mail/static/src/core/common/message.xml
index e04f43cadc7..79f88ef67a4 100644
--- a/addons/mail/static/src/core/common/message.xml
+++ b/addons/mail/static/src/core/common/message.xml
@@ -94,7 +94,7 @@
                                                 <t t-else="">
                                                     <em t-if="message.subject and !message.isSubjectSimilarToOriginThreadName and !message.isSubjectDefault" class="mb-1 me-2">Subject: <t t-esc="message.subject"/></em>
                                                     <t t-if="message.body" t-out="message.body"/>
-                                                    <small t-if="message.editDate" class="ms-2 fst-italic text-muted" t-att-title="message.editDatetimeHuge">(edited)</small>
+                                                    <small t-if="message.editDate" class="o-mail-Message-edited fst-italic text-muted" t-att-class="{ 'ms-2': !message.isBodyEmpty }" t-att-title="message.editDatetimeHuge">(edited)</small>
                                                     <t t-if="showSubtypeDescription" t-out="message.subtypeDescription"/>
                                                 </t>
                                             </div>