[FIX] theme_*: remove duplicate and conflicting classes from new pages

Given that the duplicate and conflicting classes resolved by the
previous commit did still exist at the time new page templates were
introduced in [1], they could not be avoided for new page templates
snippets.

This commit removes those from the new page templates snippets now that
they have been removed from the base snippets.

[1]: https://github.com/odoo/design-themes/commit/80cbee66f6bb4d897dd7e577f1109c75f6f6ad74

task-3562147

Part-of: odoo/design-themes#731

theme_kiddo/views/new_page_template.xml

@@ -14,6 +14,8 @@
 <template id="new_page_template_s_picture_only" inherit_id="website.new_page_template_s_picture_only">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
+        <!-- Added by both theme and new page template -->
+        <attribute name="class" add="o_colored_level" remove="o_colored_level" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
@@ -36,6 +38,8 @@
 <template id="new_page_template_basic_s_picture" inherit_id="website.new_page_template_basic_s_picture">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
+        <!-- Added by both theme and new page template -->
+        <attribute name="class" add="o_colored_level" remove="o_colored_level" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
@@ -81,6 +85,8 @@
 <template id="new_page_template_about_s_picture" inherit_id="website.new_page_template_about_s_picture">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
+        <!-- Added by both theme and new page template -->
+        <attribute name="class" add="o_colored_level" remove="o_colored_level" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Origins/16","flip":["x"]}</attribute>
     </xpath>
     <!-- Shape -->
@@ -106,12 +112,24 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_image_text" inherit_id="website.new_page_template_about_full_s_image_text">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_full_s_numbers" inherit_id="website.new_page_template_about_full_s_numbers">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_text_image" inherit_id="website.new_page_template_about_full_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_about_map_s_text_block_h1" inherit_id="website.new_page_template_about_map_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" remove="o_cc2" separator=" "/>
@@ -135,6 +153,12 @@
     </xpath>
 </template>
 
+<template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_landing_1_s_banner" inherit_id="website.new_page_template_landing_1_s_banner">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
@@ -153,12 +177,6 @@
     </xpath>
 </template>
 
-<template id="new_page_template_landing_2_s_text_block_h2" inherit_id="website.new_page_template_landing_2_s_text_block_h2">
-    <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" separator=" "/>
-    </xpath>
-</template>
-
 <template id="new_page_template_landing_2_s_three_columns" inherit_id="website.new_page_template_landing_2_s_three_columns">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
@@ -190,6 +208,13 @@
     <xpath expr="//div[hasclass('o_we_shape')]" position="replace"/>
 </template>
 
+<template id="new_page_template_landing_5_s_banner" inherit_id="website.new_page_template_landing_5_s_banner">
+    <xpath expr="//section" position="attributes">
+        <!-- Added both by theme and new page template -->
+        <attribute name="class" add="o_full_screen_height" remove="o_full_screen_height" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Gallery Pages -->
 
 <template id="new_page_template_gallery_s_banner" inherit_id="website.new_page_template_gallery_s_banner">
@@ -222,6 +247,7 @@
 <template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
     <!-- Remove shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->
@@ -239,6 +265,12 @@
 
 <!-- Snippet customization Services Pages -->
 
+<template id="new_page_template_services_s_text_image" inherit_id="website.new_page_template_services_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
+    </xpath>
+</template>
+
 <!-- Snippet customization Pricing Pages -->
 
 <template id="new_page_template_pricing_s_cover" inherit_id="website.new_page_template_pricing_s_cover">
@@ -260,6 +292,7 @@
 <template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
     <!-- Remove shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->
@@ -277,9 +310,16 @@
 
 <!-- Snippet customization Team Pages -->
 
+<template id="new_page_template_team_s_picture" inherit_id="website.new_page_template_team_s_picture">
+    <xpath expr="//section" position="attributes">
+        <!-- Added by both theme and new page template -->
+        <attribute name="class" add="o_colored_level" remove="o_colored_level" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_team_s_image_text" inherit_id="website.new_page_template_team_s_image_text">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt32" remove="pt232" separator=" "/>
+        <attribute name="class" remove="pt232" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->
@@ -288,7 +328,7 @@
 
 <template id="new_page_template_team_s_image_text_2nd" inherit_id="website.new_page_template_team_s_image_text_2nd">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pt32" remove="pt232" separator=" "/>
+        <attribute name="class" remove="pt32" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->
@@ -303,7 +343,7 @@
 
 <template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="pb32" remove="pb232" separator=" "/>
+        <attribute name="class" remove="pb56 pt56" separator=" "/>
         <attribute name="data-oe-shape-data"/>
     </xpath>
     <!-- Remove shape -->