From 3de58cf56e4d103b6d5deb716a0f55894807b800 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Wed, 25 Nov 2020 14:22:05 +0000
Subject: [PATCH] [IMP] web_editor: shape - merge some style + fix color
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Blocks and Rainy / Airy and Zigs merged together
Fix color of Bold 5 and bold 6 shape that are not easy to use due to contrast
with black, now it is grey by default.

task-2357174

closes odoo/odoo#62352

X-original-commit: 978fcbd4f6ba9f618b69560cb5fbe26602828bcb
Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
---
 .../web_editor/static/shapes/Bold/05_001.svg  |  3 ++
 .../web_editor/static/shapes/Bold/06_001.svg  |  3 ++
 .../static/src/scss/web_editor.variables.scss |  2 +
 addons/web_editor/views/snippets.xml          | 44 +++++++++----------
 4 files changed, 28 insertions(+), 24 deletions(-)
 create mode 100644 addons/web_editor/static/shapes/Bold/05_001.svg
 create mode 100644 addons/web_editor/static/shapes/Bold/06_001.svg

diff --git a/addons/web_editor/static/shapes/Bold/05_001.svg b/addons/web_editor/static/shapes/Bold/05_001.svg
new file mode 100644
index 00000000000..f475f7b6fc0
--- /dev/null
+++ b/addons/web_editor/static/shapes/Bold/05_001.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1400 570">
+    <path d="M279.4,252c-59.3-2.1-107.6-18.7-138.1-58.6L0,0V291.3H500.6c59.3,2.1,107.6,18.7,138.1,58.6L743.4,493.2C778.2,540.8,787.6,570,841,570h559V252Z" style="fill: #fafafa"/>
+</svg>
diff --git a/addons/web_editor/static/shapes/Bold/06_001.svg b/addons/web_editor/static/shapes/Bold/06_001.svg
new file mode 100644
index 00000000000..ed244e44ec4
--- /dev/null
+++ b/addons/web_editor/static/shapes/Bold/06_001.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1400 570">
+    <path d="M1271.4,369c-70.8,0-83.2-38.6-129.3-101.6L1003.5,77.6C963,24.8,899.1,2.8,820.5,0H0V202.5c67.9,6.1,123.3,28.6,159.6,76.2L298.2,468.4c46.1,63,58.5,101.6,129.3,101.6H1400V369Z" style="fill: #f6f6f6"/>
+</svg>
diff --git a/addons/web_editor/static/src/scss/web_editor.variables.scss b/addons/web_editor/static/src/scss/web_editor.variables.scss
index 70ed84765f9..d4a8058763e 100644
--- a/addons/web_editor/static/src/scss/web_editor.variables.scss
+++ b/addons/web_editor/static/src/scss/web_editor.variables.scss
@@ -658,7 +658,9 @@ $o-bg-shapes: ('web_editor': (
     'Bold/03': ('position': bottom, 'size': 100% auto, 'colors': (1, 3, 5), 'repeat-y': false),
     'Bold/04': ('position': top, 'size': 100% auto, 'colors': (2, 3), 'repeat-y': false),
     'Bold/05': ('position': center, 'size': 100% auto, 'colors': (5), 'repeat-y': false),
+    'Bold/05_001': ('position': center, 'size': 100% auto, 'colors': (3), 'repeat-y': false),
     'Bold/06': ('position': center, 'size': 100% auto, 'colors': (5), 'repeat-y': false),
+    'Bold/06_001': ('position': center, 'size': 100% auto, 'colors': (3), 'repeat-y': false),
     'Bold/07': ('position': bottom, 'size': 100% auto, 'colors': (1, 2), 'repeat-y': false),
     'Bold/08': ('position': top, 'size': 100% auto, 'colors': (1), 'repeat-y': false),
     'Bold/09': ('position': bottom, 'size': 100% auto, 'colors': (2, 3), 'repeat-y': false),
diff --git a/addons/web_editor/views/snippets.xml b/addons/web_editor/views/snippets.xml
index 649059c7bbf..69d6e81d334 100644
--- a/addons/web_editor/views/snippets.xml
+++ b/addons/web_editor/views/snippets.xml
@@ -254,11 +254,20 @@
                     <we-button data-shape="web_editor/Origins/14" data-select-label="Origins 14"/>
                     <we-button data-shape="web_editor/Origins/15" data-select-label="Origins 15"/>
                 </we-select-page>
-                <we-select-page string="Blocks">
-                    <we-button data-shape="web_editor/Blocks/01" data-select-label="Blocks 01"/>
-                    <we-button data-shape="web_editor/Blocks/02" data-select-label="Blocks 02"/>
+                <we-select-page string="Blocks &amp; Rainy">
                     <we-button data-shape="web_editor/Blocks/03" data-select-label="Blocks 03"/>
                     <we-button data-shape="web_editor/Blocks/04" data-select-label="Blocks 04"/>
+                    <we-button data-shape="web_editor/Rainy/01" data-select-label="Rainy 01"/>
+                    <we-button data-shape="web_editor/Rainy/02" data-select-label="Rainy 02"/>
+                    <we-button data-shape="web_editor/Rainy/06" data-select-label="Rainy 06"/>
+                    <we-button data-shape="web_editor/Rainy/07" data-select-label="Rainy 07"/>
+                    <we-button data-shape="web_editor/Blocks/02" data-select-label="Blocks 02"/>
+                    <we-button data-shape="web_editor/Blocks/01" data-select-label="Blocks 01"/>
+                    <we-button data-shape="web_editor/Rainy/03" data-select-label="Rainy 03"/>
+                    <we-button data-shape="web_editor/Rainy/04" data-select-label="Rainy 04"/>
+                    <we-button data-shape="web_editor/Rainy/05_001" data-select-label="Rainy 05"/>
+                    <we-button data-shape="web_editor/Rainy/08" data-select-label="Rainy 08"/>
+                    <we-button data-shape="web_editor/Rainy/09" data-select-label="Rainy 09"/>
                 </we-select-page>
                 <we-select-page string="Wavy">
                     <we-button data-shape="web_editor/Wavy/01" data-select-label="Wavy 01"/>
@@ -299,31 +308,13 @@
                     <we-button data-shape="web_editor/Blobs/11" data-select-label="Blobs 11"/>
                     <we-button data-shape="web_editor/Blobs/12" data-select-label="Blobs 12"/>
                 </we-select-page>
-                <we-select-page string="Rainy">
-                    <we-button data-shape="web_editor/Rainy/01" data-select-label="Rainy 01"/>
-                    <we-button data-shape="web_editor/Rainy/02" data-select-label="Rainy 02"/>
-                    <we-button data-shape="web_editor/Rainy/03" data-select-label="Rainy 03"/>
-                    <we-button data-shape="web_editor/Rainy/04" data-select-label="Rainy 04"/>
-                    <we-button data-shape="web_editor/Rainy/05_001" data-select-label="Rainy 05"/>
-                    <we-button data-shape="web_editor/Rainy/06" data-select-label="Rainy 06"/>
-                    <we-button data-shape="web_editor/Rainy/07" data-select-label="Rainy 07"/>
-                    <we-button data-shape="web_editor/Rainy/08" data-select-label="Rainy 08"/>
-                    <we-button data-shape="web_editor/Rainy/09" data-select-label="Rainy 09"/>
-                </we-select-page>
-                <we-select-page string="Zigs">
-                    <we-button data-shape="web_editor/Zigs/01" data-select-label="Zigs 01"/>
-                    <we-button data-shape="web_editor/Zigs/02" data-select-label="Zigs 02"/>
-                    <we-button data-shape="web_editor/Zigs/03" data-select-label="Zigs 03"/>
-                    <we-button data-shape="web_editor/Zigs/04" data-select-label="Zigs 04"/>
-                    <we-button data-shape="web_editor/Zigs/05" data-select-label="Zigs 05"/>
-                </we-select-page>
                 <we-select-page string="Bold">
                     <we-button data-shape="web_editor/Bold/01" data-select-label="Bold 01"/>
                     <we-button data-shape="web_editor/Bold/02" data-select-label="Bold 02"/>
                     <we-button data-shape="web_editor/Bold/03" data-select-label="Bold 03"/>
                     <we-button data-shape="web_editor/Bold/04" data-select-label="Bold 04"/>
-                    <we-button data-shape="web_editor/Bold/05" data-select-label="Bold 05"/>
-                    <we-button data-shape="web_editor/Bold/06" data-select-label="Bold 06"/>
+                    <we-button data-shape="web_editor/Bold/05_001" data-select-label="Bold 05"/>
+                    <we-button data-shape="web_editor/Bold/06_001" data-select-label="Bold 06"/>
                     <we-button data-shape="web_editor/Bold/07" data-select-label="Bold 07"/>
                     <we-button data-shape="web_editor/Bold/08" data-select-label="Bold 08"/>
                     <we-button data-shape="web_editor/Bold/09" data-select-label="Bold 09"/>
@@ -331,7 +322,7 @@
                     <we-button data-shape="web_editor/Bold/11_001" data-select-label="Bold 11"/>
                     <we-button data-shape="web_editor/Bold/12" data-select-label="Bold 12"/>
                 </we-select-page>
-                <we-select-page string="Airy">
+                <we-select-page string="Airy &amp; Zigs">
                     <we-button data-shape="web_editor/Airy/01" data-select-label="Airy 01"/>
                     <we-button data-shape="web_editor/Airy/02" data-select-label="Airy 02"/>
                     <we-button data-shape="web_editor/Airy/03" data-select-label="Airy 03"/>
@@ -346,6 +337,11 @@
                     <we-button data-shape="web_editor/Airy/12" data-select-label="Airy 12"/>
                     <we-button data-shape="web_editor/Airy/13" data-select-label="Airy 13"/>
                     <we-button data-shape="web_editor/Airy/14" data-select-label="Airy 14"/>
+                    <we-button data-shape="web_editor/Zigs/01" data-select-label="Zigs 01"/>
+                    <we-button data-shape="web_editor/Zigs/02" data-select-label="Zigs 02"/>
+                    <we-button data-shape="web_editor/Zigs/03" data-select-label="Zigs 03"/>
+                    <we-button data-shape="web_editor/Zigs/04" data-select-label="Zigs 04"/>
+                    <we-button data-shape="web_editor/Zigs/05" data-select-label="Zigs 05"/>
                 </we-select-page>
             </we-select-pager>
             <we-row string=" ⌙ Flip"><!-- &emsp; -->