From 3485779e04b33a0b78dd22baae676241df0e61c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Souk=C3=A9ina=20Bojabza?= <sobo@odoo.com>
Date: Mon, 10 Oct 2022 12:09:06 +0000
Subject: [PATCH] [IMP] website: improve the Masonry snippet templates

Since [1], the Masonry snippet is in grid mode only and its templates
have been modified to allow this mode. However, some of them don't look
good and have to be improved.

This is what this commit does:
- some text blocks were too small so their height has been increased
- the Masonry second default image has been replaced by another one
that looks better.

[1]: https://github.com/odoo/odoo/commit/85b352af319edec84407f2046cf795b4e5503460

task-3013055

closes odoo/odoo#102984

X-original-commit: ad8926eafd34c2743e1a5247f6171fd183e6e506
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
---
 addons/website/data/website_data.xml          |  2 +-
 .../views/snippets/s_masonry_block.xml        | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index 275de9f1baf..7cde2a755a2 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -778,7 +778,7 @@
             <field name="public" eval="True"/>
             <field name="name">s_masonry_block_default_image_2.jpg</field>
             <field name="type">url</field>
-            <field name="url">/website/static/src/img/snippets_demo/s_cover.jpg</field>
+            <field name="url">/website/static/src/img/snippets_demo/s_picture.jpg</field>
         </record>
         <record id="website.s_media_list_default_image_1" model="ir.attachment">
             <field name="public" eval="True"/>
diff --git a/addons/website/views/snippets/s_masonry_block.xml b/addons/website/views/snippets/s_masonry_block.xml
index 930978b7350..512cc47f1d1 100644
--- a/addons/website/views/snippets/s_masonry_block.xml
+++ b/addons/website/views/snippets/s_masonry_block.xml
@@ -105,19 +105,19 @@
 </template>
 
 <template id="s_masonry_block_mosaic_template" groups="base.group_user">
-    <div class="row o_grid_mode" data-row-count="12">
+    <div class="row o_grid_mode" data-row-count="13">
         <div class="o_grid_item col-lg-3 g-col-lg-3 g-height-2 text-center o_cc o_cc3" data-name="Block"
-            style="grid-area: 1 / 1 / 3 / 4; z-index: 1;">
+            style="grid-area: 1 / 1 / 4 / 4; z-index: 1;">
             <h3>A great title</h3>
             <p>And a great subtitle</p>
         </div>
         <div class="o_grid_item col-lg-3 g-col-lg-3 g-height-2 text-center o_cc o_cc2" data-name="Block"
-            style="grid-area: 1 / 4 / 3 / 7; z-index: 2;">
+            style="grid-area: 1 / 4 / 4 / 7; z-index: 2;">
             <h3>A great title</h3>
             <p>And a great subtitle</p>
         </div>
         <div class="o_grid_item col-lg-6 g-col-lg-6 g-height-10 o_grid_item_image text-center" data-name="Block"
-            style="grid-area: 3 / 1 / 13 / 7; z-index: 3;" contenteditable="false">
+            style="grid-area: 4 / 1 / 14 / 7; z-index: 3;" contenteditable="false">
             <img src="/web/image/website.s_masonry_block_default_image_1" class="img img-fluid mx-auto" alt=""/>
         </div>
 
@@ -126,12 +126,12 @@
             <img src="/web/image/website.s_masonry_block_default_image_2" class="img img-fluid mx-auto" alt=""/>
         </div>
         <div class="o_grid_item col-lg-3 g-col-lg-3 g-height-2 text-center o_cc o_cc2" data-name="Block"
-            style="grid-area: 11 / 7 / 13 / 10; z-index: 5;">
+            style="grid-area: 11 / 7 / 14 / 10; z-index: 5;">
             <h3>A great title</h3>
             <p>And a great subtitle</p>
         </div>
         <div class="o_grid_item col-lg-3 g-col-lg-3 g-height-2 text-center o_cc o_cc4" data-name="Block"
-            style="grid-area: 11 / 10 / 13 / 13; z-index: 6;">
+            style="grid-area: 11 / 10 / 14 / 13; z-index: 6;">
             <h3>A great title</h3>
             <p>And a great subtitle</p>
         </div>
@@ -169,24 +169,24 @@
 </template>
 
 <template id="s_masonry_block_alternation_text_template" groups="base.group_user">
-    <div class="row o_grid_mode" data-row-count="2">
+    <div class="row o_grid_mode" data-row-count="3">
         <div class="o_grid_item col-lg-3 g-col-lg-3 g-height-2 text-center o_cc o_cc2" data-name="Block"
-            style="grid-area: 1 / 1 / 3 / 4; z-index: 1;">
+            style="grid-area: 1 / 1 / 4 / 4; z-index: 1;">
             <h3>A great title</h3>
             <p>And a great subtitle</p>
         </div>
         <div class="o_grid_item col-lg-3 g-col-lg-3 g-height-2 text-center o_cc o_cc4" data-name="Block"
-            style="grid-area: 1 / 4 / 3 / 7; z-index: 2;">
+            style="grid-area: 1 / 4 / 4 / 7; z-index: 2;">
             <h3>A great title</h3>
             <p>And a great subtitle</p>
         </div>
         <div class="o_grid_item col-lg-3 g-col-lg-3 g-height-2 text-center o_cc o_cc2" data-name="Block"
-            style="grid-area: 1 / 7 / 3 / 10; z-index: 3;">
+            style="grid-area: 1 / 7 / 4 / 10; z-index: 3;">
             <h3>A great title</h3>
             <p>And a great subtitle</p>
         </div>
         <div class="o_grid_item col-lg-3 g-col-lg-3 g-height-2 text-center o_cc o_cc3" data-name="Block"
-            style="grid-area: 1 / 10 / 3 / 13; z-index: 4;">
+            style="grid-area: 1 / 10 / 4 / 13; z-index: 4;">
             <h3>A great title</h3>
             <p>And a great subtitle</p>
         </div>