From 332da2e2fbef6a7fbfb02110acf86ecaa73c9849 Mon Sep 17 00:00:00 2001
From: Antoine Guenet <age@odoo.com>
Date: Fri, 15 Apr 2022 13:37:12 +0000
Subject: [PATCH] [FIX] mass_mailing: prevent website s_hr interference with
 mass_mailing

`wWebsite`'s `s_hr` snippet css targets the same element as
`mass_mailing`'s `hr` snippet, resulting in interferences. This raises
the speciticity of `mass_mailing.s_hr`'s css to counter that issue.

X-original-commit: 112758b7c07870c5d002a87f4eed58bd8feb9bee
Part-of: odoo/odoo#92138
---
 addons/mass_mailing/static/src/snippets/s_hr/000.scss | 2 +-
 addons/mass_mailing/views/snippets/s_hr.xml           | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/mass_mailing/static/src/snippets/s_hr/000.scss b/addons/mass_mailing/static/src/snippets/s_hr/000.scss
index 3dadc70e714..ddea9a871f8 100644
--- a/addons/mass_mailing/static/src/snippets/s_hr/000.scss
+++ b/addons/mass_mailing/static/src/snippets/s_hr/000.scss
@@ -1,5 +1,5 @@
 
-.s_hr {
+.o_layout .s_hr {
     line-height: 0;
     hr {
         padding: 0;
diff --git a/addons/mass_mailing/views/snippets/s_hr.xml b/addons/mass_mailing/views/snippets/s_hr.xml
index 94f2a4f43ab..ab937496081 100644
--- a/addons/mass_mailing/views/snippets/s_hr.xml
+++ b/addons/mass_mailing/views/snippets/s_hr.xml
@@ -5,6 +5,9 @@
     <xpath expr="//div[hasclass('s_hr')]" position="attributes">
         <attribute name="class" add="o_mail_snippet_general pt16 pb16" remove="pt32 pb32" separator=" "/>
     </xpath>
+    <xpath expr="//hr" position="attributes">
+        <attribute name="class" remove="w-100 mx-auto" separator=" "/>
+    </xpath>
 </template>
 
 <template id="s_hr_options" inherit_id="mass_mailing.snippet_options">