[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_monglia/views/new_page_template.xml

@@ -30,7 +30,8 @@
 
 <template id="new_page_template_basic_2_s_text_block_h1" inherit_id="website.new_page_template_basic_2_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc2" remove="o_cc5" separator=" "/>
+        <!-- o_cc2 is added by both theme and new page template -->
+        <attribute name="class" add="o_cc2" remove="o_cc2 o_cc5" separator=" "/>
     </xpath>
 </template>
 
@@ -57,13 +58,13 @@
 
 <template id="new_page_template_about_full_1_s_text_block_h1" inherit_id="website.new_page_template_about_full_1_s_text_block_h1">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" remove="o_cc2" separator=" "/>
+        <attribute name="class" add="pt40" remove="o_cc2 pt0" separator=" "/>
     </xpath>
 </template>
 
-<template id="new_page_template_about_full_1_s_text_block_h2" inherit_id="website.new_page_template_about_full_1_s_text_block_h2">
+<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" add="o_cc2" separator=" "/>
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
     </xpath>
 </template>
 
@@ -73,8 +74,16 @@
     </xpath>
 </template>
 
+<template id="new_page_template_about_full_s_text_block_h1" inherit_id="website.new_page_template_about_full_s_text_block_h1">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc2" 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">
+        <!-- pt56 added by both theme and new page template -->
+        <attribute name="class" add="pt56" remove="pt56 pb40" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/04","flip":["y"]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
@@ -95,6 +104,9 @@
 </template>
 
 <template id="new_page_template_about_mini_s_text_block_2nd" inherit_id="website.new_page_template_about_mini_s_text_block_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt40" remove="pt0" separator=" "/>
+    </xpath>
     <xpath expr="//p" position="attributes">
         <attribute name="style" remove="font-size:36px;" separator=" "/>
     </xpath>
@@ -102,7 +114,8 @@
 
 <template id="new_page_template_about_personal_s_text_block_h2" inherit_id="website.new_page_template_about_personal_s_text_block_h2">
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc3" remove="o_cc5" separator=" "/>
+        <!-- o_cc3 is added by both theme and new page template -->
+        <attribute name="class" add="o_cc3" remove="o_cc3 o_cc5" separator=" "/>
     </xpath>
 </template>
 
@@ -110,6 +123,8 @@
 
 <template id="new_page_template_landing_s_text_image" inherit_id="website.new_page_template_landing_s_text_image">
     <xpath expr="//section" position="attributes">
+        <!-- pt56 is added by both theme and new page template -->
+        <attribute name="class" add="pt56" remove="pt56 pb40" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/04","flip":["y"]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
@@ -124,6 +139,31 @@
     </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" remove="o_cc2" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_landing_3_s_text_block_h2" inherit_id="website.new_page_template_landing_3_s_text_block_h2">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="o_cc2" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_landing_4_s_text_block_h2" inherit_id="website.new_page_template_landing_4_s_text_block_h2">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt40" remove="pt0" separator=" "/>
+    </xpath>
+</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">
@@ -139,10 +179,23 @@
     </xpath>
 </template>
 
+<template id="new_page_template_gallery_s_image_text_2nd" inherit_id="website.new_page_template_gallery_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_gallery_2_s_text_block_2nd" inherit_id="website.new_page_template_gallery_2_s_text_block_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt40" remove="pt0" separator=" "/>
+    </xpath>
+</template>
+
 <!-- 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=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/04","flip":["y"]}</attribute>
     </xpath>
     <xpath expr="//div[hasclass('container')]" position="before">
@@ -150,6 +203,18 @@
     </xpath>
 </template>
 
+<template id="new_page_template_services_0_s_text_block_2nd" inherit_id="website.new_page_template_services_0_s_text_block_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt40" remove="pt0" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_services_2_s_text_image" inherit_id="website.new_page_template_services_2_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt56 pb56" remove="pb40" separator=" "/>
+    </xpath>
+</template>
+
 <template id="new_page_template_services_3_s_text_block_h1" inherit_id="website.new_page_template_services_3_s_text_block_h1">
     <xpath expr="//section" position="attributes">
         <attribute name="class" add="pb0" remove="pb40" separator=" "/>
@@ -165,11 +230,25 @@
     </xpath>
 </template>
 
+<template id="new_page_template_pricing_s_image_text_2nd" inherit_id="website.new_page_template_pricing_s_image_text_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt48 pb56" separator=" "/>
+    </xpath>
+</template>
+
+<template id="new_page_template_pricing_0_s_text_block_2nd" inherit_id="website.new_page_template_pricing_0_s_text_block_2nd">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt40" remove="pt0" separator=" "/>
+    </xpath>
+</template>
+
+
 <!-- Snippet customization Team Pages -->
 
 <template id="new_page_template_team_s_text_image" inherit_id="website.new_page_template_team_s_text_image">
     <!-- Shape option -->
     <xpath expr="//section" position="attributes">
+        <attribute name="class" remove="pt56 pb56" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Floats/13","flip":["y"]}</attribute>
     </xpath>
     <!-- Shape -->
@@ -190,4 +269,10 @@
     </xpath>
 </template>
 
+<template id="new_page_template_team_1_s_text_image" inherit_id="website.new_page_template_team_1_s_text_image">
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="pt56 pb56" remove="pb40" separator=" "/>
+    </xpath>
+</template>
+
 </odoo>