[REF] theme_default: adapt the scss convertion for everything to work

1 files changed, 97 insertions, 55 deletions

diff --git a/addons/theme_default/views/theme_default_templates.xml b/addons/theme_default/views/theme_default_templates.xml
index 3c23a080aa3..5b98ef506d5 100644
--- a/addons/theme_default/views/theme_default_templates.xml
+++ b/addons/theme_default/views/theme_default_templates.xml
@@ -1,9 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-<template id="assets_frontend" inherit_id="website.assets_frontend" name="Theme Default Assets Frontend">
-  <xpath expr="link[last()]" position="after">
-    <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/customize_modal.scss"/>
-  </xpath>
+<template id="_assets_primary_variables" inherit_id="web._assets_primary_variables">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/primary_variables.scss"/>
+    </xpath>
+</template>
+<template id="_assets_frontend_helpers" inherit_id="web._assets_frontend_helpers">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/bootstrap_overridden.scss"/>
+    </xpath>
+</template>
+<template id="assets_frontend" inherit_id="website.assets_frontend">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/colors.scss"/>
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/customize_modal.scss"/>
+    </xpath>
 </template>
 
 <template id="customize_modal" inherit_id="website.theme_customize" name="theme_default modal">
@@ -50,31 +61,31 @@
                           <td>
                               <label class="chd-color-combi">
                                   <img src="/theme_default/static/src/img/theme/variant-emerald.gif" alt="Emerald" class="chd-color-combi-img"/>
-                                  <input name="colorvar" type="radio" data-xmlid="theme_default.option_color_emerald"/>
+                                  <input name="colorvar" type="radio" data-xmlid="theme_default.option_color_emerald_variables,theme_default.option_color_emerald_bs_variables,theme_default.option_color_emerald"/>
                               </label>
                           </td>
                           <td>
                               <label class="chd-color-combi">
                                   <img src="/theme_default/static/src/img/theme/variant-cobalt.gif" alt="Cobalt" class="chd-color-combi-img"/>
-                                  <input name="colorvar" type="radio" data-xmlid="theme_default.option_color_cobalt"/>
+                                  <input name="colorvar" type="radio" data-xmlid="theme_default.option_color_cobalt_variables,theme_default.option_color_cobalt_bs_variables,theme_default.option_color_cobalt"/>
                               </label>
                           </td>
                           <td>
                               <label class="chd-color-combi">
                                   <img src="/theme_default/static/src/img/theme/variant-amethyst.gif" alt="Amethyst" class="chd-color-combi-img"/>
-                                  <input name="colorvar" type="radio" data-xmlid="theme_default.option_color_amethyst"/>
+                                  <input name="colorvar" type="radio" data-xmlid="theme_default.option_color_amethyst_variables,theme_default.option_color_amethyst_bs_variables,theme_default.option_color_amethyst"/>
                               </label>
                           </td>
                           <td>
                               <label class="chd-color-combi">
                                   <img src="/theme_default/static/src/img/theme/variant-ruby.gif" alt="Blue" class="chd-color-combi-img"/>
-                                  <input name="colorvar" type="radio" data-xmlid="theme_default.option_color_ruby"/>
+                                  <input name="colorvar" type="radio" data-xmlid="theme_default.option_color_ruby_variables,theme_default.option_color_ruby_bs_variables,theme_default.option_color_ruby"/>
                               </label>
                           </td>
                           <td>
                               <label class="chd-color-combi">
                                   <img src="/theme_default/static/src/img/theme/variant-gold.gif" alt="Gold" class="chd-color-combi-img"/>
-                                  <input name="colorvar" type="radio" data-xmlid="theme_default.option_color_gold"/>
+                                  <input name="colorvar" type="radio" data-xmlid="theme_default.option_color_gold_variables,theme_default.option_color_gold_bs_variables,theme_default.option_color_gold"/>
                               </label>
                           </td>
                       </tr>
@@ -110,63 +121,94 @@
   </xpath>
 </template>
 
-<template id="colors" name="Colors" inherit_id="website.assets_frontend">
-  <xpath expr="." position="inside">
-    <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/colors.scss"/>
-  </xpath>
-</template>
-
 <!-- Option layout -->
-
-<template id="option_layout_boxed" name="option_layout_boxed" inherit_id="website.assets_frontend" active="False" customize_show="False">
-  <xpath expr="." position="inside">
-      <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_layout_boxed.scss"/>
-  </xpath>
+<template id="option_layout_boxed" inherit_id="theme_default.assets_frontend" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_layout_boxed.scss"/>
+    </xpath>
 </template>
 
 <!-- Option color -->
-
-<template id="option_color_stone" name="option_color_stone" inherit_id="website.assets_frontend" active="False" customize_show="False">
-  <xpath expr="." position="inside">
-    <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_stone.scss"/>
-  </xpath>
+<template id="option_color_emerald_variables" inherit_id="theme_default._assets_primary_variables" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_emerald_variables.scss"/>
+    </xpath>
 </template>
-
-<template id="option_color_emerald" name="option_color_emerald" inherit_id="website.assets_frontend" active="False" customize_show="False">
-  <xpath expr="." position="inside">
-    <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_emerald.scss"/>
-  </xpath>
+<template id="option_color_emerald_bs_variables" inherit_id="theme_default._assets_frontend_helpers" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_emerald_bs_variables.scss"/>
+    </xpath>
 </template>
-
-<template id="option_color_cobalt" name="option_color_cobalt" inherit_id="website.assets_frontend" active="False" customize_show="False">
-  <xpath expr="." position="inside">
-    <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_cobalt.scss"/>
-  </xpath>
+<template id="option_color_emerald" inherit_id="theme_default.assets_frontend" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_emerald.scss"/>
+    </xpath>
 </template>
-
-<template id="option_color_amethyst" name="option_color_amethyst" inherit_id="website.assets_frontend" active="False" customize_show="False">
-  <xpath expr="." position="inside">
-    <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_amethyst.scss"/>
-  </xpath>
+<template id="option_color_cobalt_variables" inherit_id="theme_default._assets_primary_variables" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_cobalt_variables.scss"/>
+    </xpath>
 </template>
-
-<template id="option_color_ruby" name="option_color_ruby" inherit_id="website.assets_frontend" active="False" customize_show="False">
-  <xpath expr="." position="inside">
-    <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_ruby.scss"/>
-  </xpath>
+<template id="option_color_cobalt_bs_variables" inherit_id="theme_default._assets_frontend_helpers" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_cobalt_bs_variables.scss"/>
+    </xpath>
 </template>
-
-<template id="option_color_gold" name="option_color_gold" inherit_id="website.assets_frontend" active="False" customize_show="False">
-  <xpath expr="." position="inside">
-    <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_gold.scss"/>
-  </xpath>
+<template id="option_color_cobalt" inherit_id="theme_default.assets_frontend" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_cobalt.scss"/>
+    </xpath>
+</template>
+<template id="option_color_amethyst_variables" inherit_id="theme_default._assets_primary_variables" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_amethyst_variables.scss"/>
+    </xpath>
+</template>
+<template id="option_color_amethyst_bs_variables" inherit_id="theme_default._assets_frontend_helpers" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_amethyst_bs_variables.scss"/>
+    </xpath>
+</template>
+<template id="option_color_amethyst" inherit_id="theme_default.assets_frontend" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_amethyst.scss"/>
+    </xpath>
+</template>
+<template id="option_color_ruby_variables" inherit_id="theme_default._assets_primary_variables" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_ruby_variables.scss"/>
+    </xpath>
+</template>
+<template id="option_color_ruby_bs_variables" inherit_id="theme_default._assets_frontend_helpers" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_ruby_bs_variables.scss"/>
+    </xpath>
+</template>
+<template id="option_color_ruby" inherit_id="theme_default.assets_frontend" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_ruby.scss"/>
+    </xpath>
+</template>
+<template id="option_color_gold_variables" inherit_id="theme_default._assets_primary_variables" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_gold_variables.scss"/>
+    </xpath>
+</template>
+<template id="option_color_gold_bs_variables" inherit_id="theme_default._assets_frontend_helpers" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_gold_bs_variables.scss"/>
+    </xpath>
+</template>
+<template id="option_color_gold" inherit_id="theme_default.assets_frontend" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_color_gold.scss"/>
+    </xpath>
 </template>
 
 <!-- Option font -->
-
-<template id="option_font" name="option_font" inherit_id="website.assets_frontend" active="False" customize_show="False">
-  <xpath expr="." position="inside">
-    <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_font.scss"/>
-  </xpath>
+<template id="option_font" inherit_id="theme_default._assets_frontend_helpers" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/theme_default/static/src/scss/option_font.scss"/>
+    </xpath>
 </template>
 </odoo>