[FIX] theme_*: fix duplicate inline styles

*: avantgarde, beauty, bistro, buzzy, clean, cobalt, graphene, kea, yes

This commit adapts the style attribute's add/remove operations in order
to avoid ending up with the same property defined several times.

task-4206845

Part-of: odoo/design-themes#933
Related: odoo/odoo#181194
Signed-off-by: Alice Gaudon (agau) <agau@odoo.com>
This commit is contained in:
Benoit Socias
2024-09-24 14:48:00 +02:00
parent 6d1a98775e
commit 266b35a31e
9 changed files with 8 additions and 11 deletions
+1 -1
View File
@@ -16,7 +16,7 @@
<attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/18","flip":["x"]}</attribute>
</xpath>
<xpath expr="//span[hasclass('s_parallax_bg')]" position="attributes">
<attribute name="style" remove="background-position: 50% 0;" add="background-position: 50% 80%;" separator=";"/>
<attribute name="style" remove="background-position: 50% 75%;" add="background-position: 50% 80%;" separator=";"/>
</xpath>
<xpath expr="//div[hasclass('s_allow_columns')]" position="before">
<div class="o_we_shape o_web_editor_Origins_18" style="background-image: url('/web_editor/shape/web_editor/Origins/18.svg?c1=o-color-2&amp;flip=x'); background-position: 50% 50%;"/>
+1 -1
View File
@@ -8,7 +8,7 @@
</xpath>
<!-- Change position of background image -->
<xpath expr="//span[hasclass('s_parallax_bg')]" position="attributes">
<attribute name="style" add="background-position: 50% 50%;" remove="background-position: 50% 0;" separator=";"/>
<attribute name="style" add="background-position: 50% 50%;" remove="background-position: 50% 75%;" separator=";"/>
</xpath>
<!-- Filter -->
<xpath expr="//div[hasclass('o_we_bg_filter')]" position="attributes">
+1 -1
View File
@@ -4,7 +4,7 @@
<template id="s_cover" inherit_id="website.s_cover">
<!-- Parallax -->
<xpath expr="//*[hasclass('s_parallax_bg')]" position="attributes">
<attribute name="style" add="background-position: 50% 100%;" remove="background-position: 50% 0;" separator=";"/>
<attribute name="style" add="background-position: 50% 100%;" remove="background-position: 50% 75%;" separator=";"/>
</xpath>
<!-- Title -->
<xpath expr="//h1" position="replace" mode="inner">
+1 -1
View File
@@ -18,7 +18,7 @@
90%
</xpath>
<xpath expr="//h2/following-sibling::div" position="attributes">
<attribute name="style" add="font-size: 7.75rem;" remove="font-size: 10.75rem;" separator=";"/>
<attribute name="style" add="font-size: 7.75rem;" remove="font-size: 2.25rem;" separator=";"/>
</xpath>
</template>
+1 -1
View File
@@ -18,7 +18,7 @@
90%
</xpath>
<xpath expr="//h2/following-sibling::div" position="attributes">
<attribute name="style" add="font-size: 7.75rem;" remove="font-size: 10.75rem;" separator=";"/>
<attribute name="style" add="font-size: 7.75rem;" remove="font-size: 2.25rem;" separator=";"/>
</xpath>
</template>
+1 -1
View File
@@ -526,7 +526,7 @@
90%
</xpath>
<xpath expr="//h2/following-sibling::div" position="attributes">
<attribute name="style" add="font-size: 7.75rem;" remove="font-size: 10.75rem;" separator=";"/>
<attribute name="style" add="font-size: 7.75rem;" remove="font-size: 2.25rem;" separator=";"/>
</xpath>
</template>
+1 -1
View File
@@ -591,7 +591,7 @@
90%
</xpath>
<xpath expr="//h2/following-sibling::div" position="attributes">
<attribute name="style" add="font-size: 7.75rem;" remove="font-size: 10.75rem;" separator=";"/>
<attribute name="style" add="font-size: 7.75rem;" remove="font-size: 2.25rem;" separator=";"/>
</xpath>
</template>
-3
View File
@@ -21,9 +21,6 @@
<xpath expr="//p" position="replace" mode="inner">
Put yourself at the center of an extraordinary gaming universe with exclusive games.
</xpath>
<xpath expr="//p" position="attributes">
<attribute name="style" add="text-align: center;" separator=";"/>
</xpath>
<!-- Caption -->
<xpath expr="//figcaption" position="replace">
<figcaption class="figure-caption text-muted py-3">Watch as a living game world comes alive all around you, with a seamless field of view wherever you look.</figcaption>
@@ -7,7 +7,7 @@
</xpath>
<!-- Quote 1 -->
<xpath expr="//div[hasclass('carousel-item')]" position="attributes">
<attribute name="style" add="background-image: url('/web/image/website.s_quotes_carousel_demo_image_0'); background-position: 50% 25%;" separator=";"/>
<attribute name="style" remove="background-position: 50% 50%;" add="background-position: 50% 25%;" separator=";"/>
</xpath>
<xpath expr="//blockquote" position="before">
<div class="o_we_bg_filter" style="background-color: rgba(25, 41, 37, 0.55) !important;"/>