From 51db7cd7b6904d68e5d30fcbd8debf5b5baad792 Mon Sep 17 00:00:00 2001 From: Romeo Fragomeli Date: Fri, 13 Jan 2023 11:43:14 +0000 Subject: [PATCH] [FIX] *: some border aren't apply anymore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * = digest, hw_posbox_homepage, im_livechat, mass_mailing, web_editor, website, website_slides_forum Since the migration of Bootstrap 5 [1], some CSS rules was automatically converted (`border-left` and `border-right`) when it shouldn't be. These conversions were made because the CSS rules was embedded in HTML/XML code and the REGEX for the conversion had no protection for these cases. This commit restores the old correct value. Ref: [1] odoo/odoo@1fcd098af5fa18e848c66bb83bdceb6ba0308512 closes odoo/odoo#110141 X-original-commit: 0cbf7c00ecc307fc725da345415647828e771bb4 Signed-off-by: Adrien Dieudonné (adr) Signed-off-by: Romeo Fragomeli (rfr) --- addons/digest/data/digest_data.xml | 4 ++-- addons/hw_posbox_homepage/views/homepage.html | 4 ++-- addons/im_livechat/data/mail_templates.xml | 4 ++-- addons/mass_mailing/views/snippets_themes.xml | 8 ++++---- addons/web_editor/static/src/xml/wysiwyg.xml | 2 +- addons/website/views/snippets/snippets.xml | 2 +- .../views/website_slides_forum_templates.xml | 6 +++--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/addons/digest/data/digest_data.xml b/addons/digest/data/digest_data.xml index 8709bc7b969..956c9ea9d07 100644 --- a/addons/digest/data/digest_data.xml +++ b/addons/digest/data/digest_data.xml @@ -263,8 +263,8 @@ } #header { padding: 20px 30px 25px 30px; - border-start: 1px solid var(--color-company); - border-end: 1px solid var(--color-company); + border-left: 1px solid var(--color-company); + border-right: 1px solid var(--color-company); } .global_layout { padding: 25px 30px 30px 30px; diff --git a/addons/hw_posbox_homepage/views/homepage.html b/addons/hw_posbox_homepage/views/homepage.html index 876b7ee3ed6..70d4c62340f 100644 --- a/addons/hw_posbox_homepage/views/homepage.html +++ b/addons/hw_posbox_homepage/views/homepage.html @@ -32,10 +32,10 @@ } table td { padding: 8px; - border-start: 1px solid #f1f1f1; + border-left: 1px solid #f1f1f1; } table td:first-child { - border-start: 0; + border-left: 0; } td.heading { font-weight: bold; diff --git a/addons/im_livechat/data/mail_templates.xml b/addons/im_livechat/data/mail_templates.xml index b1466120cb0..29d1c5e2032 100644 --- a/addons/im_livechat/data/mail_templates.xml +++ b/addons/im_livechat/data/mail_templates.xml @@ -26,8 +26,8 @@ - - + +
diff --git a/addons/mass_mailing/views/snippets_themes.xml b/addons/mass_mailing/views/snippets_themes.xml index 3b9566b9c37..ec7fc13500c 100644 --- a/addons/mass_mailing/views/snippets_themes.xml +++ b/addons/mass_mailing/views/snippets_themes.xml @@ -269,7 +269,7 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml index ea60117c837..8ef685056fc 100644 --- a/addons/website/views/snippets/snippets.xml +++ b/addons/website/views/snippets/snippets.xml @@ -268,7 +268,7 @@