diff options
| author | Samuel Degueldre <sad@odoo.com> | 2020-08-26 09:23:35 +0000 |
|---|---|---|
| committer | Samuel Degueldre <sad@odoo.com> | 2020-09-04 11:17:56 +0000 |
| commit | c0f62593a4da37e8404dddc0a5762879a5ebbf7f (patch) | |
| tree | f8ab9f83d71746657b2869d0b703cfb4c8f1fd64 /addons/web_editor | |
| parent | 24e962b5164917643bfc9be575b5f2417d44ddb3 (diff) | |
[FIX] web_editor: various shape fixes (hide on mobile, bad joint, ...)
This commit fixes various things with the shapes: shapes are now hidden
on mobile by default, the shapes "blobs 02" and "blobs 03" now connect
properly, and the shape pager now shows the name of the current page.
Airy shapes now have embedded media-queries so that they're more visible
in the shape selector. The order of the pages in the shape selector has
been adapted so that shapes that are easier to use are on the first few
pages. A number of shapes have been "cut" differently to leave more
space for content, and some shapes have had their top/bottom anchoring
swapped.
task-2319484
closes odoo/odoo#56567
Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
Diffstat (limited to 'addons/web_editor')
28 files changed, 286 insertions, 220 deletions
diff --git a/addons/web_editor/static/shapes/Airy/01.svg b/addons/web_editor/static/shapes/Airy/01.svg index d8a2204a8f0..fba4a5064e6 100644 --- a/addons/web_editor/static/shapes/Airy/01.svg +++ b/addons/web_editor/static/shapes/Airy/01.svg @@ -1,7 +1,11 @@ -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1400 570"> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -830 1400 1400"> <style type="text/css"> .st0{fill:none;stroke:#3AADAA;stroke-width:3;stroke-miterlimit:10;} .st1{fill:none;stroke:#3AADAA;stroke-miterlimit:10;} + @media only screen and (max-width: 300px) { + .st0{stroke-width:9} + .st1{stroke-width:3} + } </style> <g> <polyline class="st0" points="1.9,570 700.1,285 1402.6,570 "/> diff --git a/addons/web_editor/static/shapes/Airy/02.svg b/addons/web_editor/static/shapes/Airy/02.svg index 68895cc86d6..22d22c5b003 100644 --- a/addons/web_editor/static/shapes/Airy/02.svg +++ b/addons/web_editor/static/shapes/Airy/02.svg @@ -1,45 +1,37 @@ -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1400 570"> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1400 1400"> <style type="text/css"> .st0{fill:none;stroke:#3AADAA;stroke-width:3;stroke-miterlimit:10;} .st1{fill:none;stroke:#3AADAA;stroke-miterlimit:10;} + @media only screen and (max-width: 300px) { + .st0{stroke-width:9} + .st1{stroke-width:3} + } </style> <g> - <polyline class="st0" points="0,570 700,285 1400.7,570 "/> - <polyline class="st1" points="1400,547.2 699.9,262.2 0,547.2 "/> - <polyline class="st1" points="1400,524.4 699.8,239.4 0,524.4 "/> - <polyline class="st1" points="1400,501.6 699.7,216.6 0,501.6 "/> - <polyline class="st1" points="1400,478.8 699.6,193.8 0,478.8 "/> - <polyline class="st1" points="1400,455.9 699.5,171 0,456 "/> - <polyline class="st1" points="1400,433.1 699.4,148.2 0,433.2 "/> - <polyline class="st1" points="1400,410.3 699.3,125.4 0,410.4 "/> - <polyline class="st1" points="1400,387.5 699.2,102.6 0,387.6 "/> - <polyline class="st1" points="1400,364.7 699.1,79.8 0,364.8 "/> - <polyline class="st1" points="1400,341.9 699,57 0,342 "/> - <polyline class="st1" points="1400,319.1 698.9,34.2 0,319.2 "/> - <polyline class="st1" points="1400,296.3 698.8,11.4 0,296.4 "/> - <line class="st1" x1="672.7" y1="0" x2="1.9" y2="273.6"/> - <line class="st1" x1="1401.9" y1="273.5" x2="728.7" y2="0"/> - <line class="st1" x1="616.7" y1="0" x2="1.9" y2="250.8"/> - <line class="st1" x1="1401.9" y1="250.6" x2="784.8" y2="0"/> - <line class="st1" x1="560.7" y1="0" x2="1.9" y2="228"/> - <line class="st1" x1="1401.9" y1="227.8" x2="841.4" y2="0.2"/> - <line class="st1" x1="504.8" y1="0" x2="1.9" y2="205.2"/> - <line class="st1" x1="1401.9" y1="205" x2="896.9" y2="0"/> - <line class="st1" x1="448.9" y1="0" x2="1.9" y2="182.4"/> - <line class="st1" x1="1401.9" y1="182.2" x2="953.6" y2="0.2"/> - <line class="st1" x1="392.9" y1="0" x2="1.9" y2="159.6"/> - <line class="st1" x1="1401.9" y1="159.4" x2="1009.1" y2="0"/> - <line class="st1" x1="337" y1="0" x2="1.9" y2="136.8"/> - <line class="st1" x1="1401.9" y1="136.6" x2="1065.3" y2="0"/> - <line class="st1" x1="281.1" y1="0" x2="1.9" y2="114"/> - <line class="st1" x1="1401.9" y1="113.8" x2="1121.5" y2="0"/> - <line class="st1" x1="225.2" y1="0" x2="1.9" y2="91.2"/> - <line class="st1" x1="1401.9" y1="91" x2="1177" y2="-0.3"/> - <line class="st1" x1="169.4" y1="0" x2="1.9" y2="68.4"/> - <line class="st1" x1="1401.9" y1="68.2" x2="1233.2" y2="-0.3"/> - <line class="st1" x1="113.5" y1="0" x2="1.9" y2="45.6"/> - <line class="st1" x1="1401.9" y1="45.3" x2="1289.4" y2="-0.3"/> - <line class="st1" x1="57.7" y1="0" x2="1.9" y2="22.8"/> - <line class="st1" x1="1401.9" y1="22.5" x2="1346.9" y2="0.2"/> + <polyline class="st0" points="0,296.7 700,11.7 1400.7,296.7 "/> + <line class="st1" x1="672.6" y1="0" x2="0" y2="273.9"/> + <line class="st1" x1="1400" y1="273.9" x2="728.6" y2="0"/> + <line class="st1" x1="616.1" y1="0" x2="0" y2="251.1"/> + <line class="st1" x1="1400" y1="251.1" x2="784.6" y2="0"/> + <line class="st1" x1="559.8" y1="0" x2="0" y2="228.3"/> + <line class="st1" x1="1400" y1="228.3" x2="841.1" y2="0"/> + <line class="st1" x1="503.7" y1="0" x2="0" y2="205.5"/> + <line class="st1" x1="1400" y1="205.5" x2="896.6" y2="0"/> + <line class="st1" x1="447.7" y1="0" x2="0" y2="182.7"/> + <line class="st1" x1="1400" y1="182.6" x2="952.4" y2="0"/> + <line class="st1" x1="391.7" y1="0" x2="0" y2="159.9"/> + <line class="st1" x1="1400" y1="159.8" x2="1008.9" y2="0"/> + <line class="st1" x1="335.7" y1="0" x2="0" y2="137.1"/> + <line class="st1" x1="1400" y1="137" x2="1063.1" y2="0"/> + <line class="st1" x1="279.7" y1="0" x2="0" y2="114.3"/> + <line class="st1" x1="1400" y1="114.2" x2="1121.2" y2="0"/> + <line class="st1" x1="223.7" y1="0" x2="0" y2="91.5"/> + <line class="st1" x1="1400" y1="91.4" x2="1177.4" y2="0"/> + <line class="st1" x1="168" y1="0" x2="0" y2="68.7"/> + <line class="st1" x1="1400" y1="68.6" x2="1231.5" y2="0"/> + <line class="st1" x1="111.8" y1="0" x2="0" y2="45.9"/> + <line class="st1" x1="1400" y1="45.8" x2="1289.1" y2="0"/> + <line class="st1" x1="55.9" y1="0" x2="0" y2="23.1"/> + <line class="st1" x1="1400" y1="23" x2="1343.4" y2="0"/> </g> </svg> diff --git a/addons/web_editor/static/shapes/Airy/03.svg b/addons/web_editor/static/shapes/Airy/03.svg index f30dee97d14..3de5a0a0fd0 100644 --- a/addons/web_editor/static/shapes/Airy/03.svg +++ b/addons/web_editor/static/shapes/Airy/03.svg @@ -12,6 +12,16 @@ .st6{fill:none;stroke:#383E45;stroke-width:0.6809;stroke-miterlimit:10;} .st7{fill:none;stroke:#383E45;stroke-width:0.5238;stroke-miterlimit:10;} .st8{fill:none;stroke:#383E45;stroke-width:0.3666;stroke-miterlimit:10;} + @media only screen and (max-width: 300px) { + .st1{stroke-width:4.3995} + .st2{stroke-width:3.9282} + .st3{stroke-width:3.4569} + .st4{stroke-width:2.9856} + .st5{stroke-width:2.5140} + .st6{stroke-width:2.0427} + .st7{stroke-width:1.5714} + .st8{stroke-width:1.0998} + } </style> <g class="st0"> <path class="st1" d="M-1.9,79.2c27.4,7.3,60.7,4,88.4-3s52.1-17.2,79.6-24.4c46.9-12.3,102.3-15.2,152.2-7.1 diff --git a/addons/web_editor/static/shapes/Airy/04.svg b/addons/web_editor/static/shapes/Airy/04.svg index 34c55b657a6..c6ceba19575 100644 --- a/addons/web_editor/static/shapes/Airy/04.svg +++ b/addons/web_editor/static/shapes/Airy/04.svg @@ -1,6 +1,9 @@ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1400 570" preserveAspectRatio="none"> <style type="text/css"> .st0{fill:none;stroke:#3AADAA;stroke-miterlimit:10;} + @media only screen and (max-width: 300px) { + .st0{stroke-width:4} + } </style> <g> <path class="st0" d="M1260.5,0.5c3.9,4.4,7.7,9.1,11.5,13.8c57.8,72.7-222,169-222,271.2s279.8,198.6,221.9,271.3 diff --git a/addons/web_editor/static/shapes/Airy/05.svg b/addons/web_editor/static/shapes/Airy/05.svg index 4f297aaf877..c539be503d1 100644 --- a/addons/web_editor/static/shapes/Airy/05.svg +++ b/addons/web_editor/static/shapes/Airy/05.svg @@ -2,6 +2,10 @@ <style type="text/css"> .st0{fill:none;stroke:#3AADAA;stroke-miterlimit:10;} .st1{fill:none;stroke:#3AADAA;stroke-width:0.9994;stroke-miterlimit:10;} + @media only screen and (max-width: 300px) { + .st0{stroke-width:3} + .st1{stroke-width:3} + } </style> <g> <path class="st0" d="M1260.5,0c-19.6,19.3-44.3,34.5-41.1,53.1c6.2,35.4,146.6,72.9,146.6,113.1c0,72.3-126.5,99.3-136.6,156.3 diff --git a/addons/web_editor/static/shapes/Airy/06.svg b/addons/web_editor/static/shapes/Airy/06.svg index 686bfef6061..66bc051ae7f 100644 --- a/addons/web_editor/static/shapes/Airy/06.svg +++ b/addons/web_editor/static/shapes/Airy/06.svg @@ -68,6 +68,9 @@ .st65{fill:none;stroke:#7C6576;stroke-width:0.303;stroke-miterlimit:10;} .st66{fill:none;stroke:#7C6576;stroke-width:0.2765;stroke-miterlimit:10;} .st67{fill:none;stroke:#7C6576;stroke-width:0.25;stroke-miterlimit:10;} + @media only screen and (max-width: 300px) { + .st0{opacity:.7;} + } </style> <g class="st0"> <path class="st1" d="M-3.8,158.1c1.3,0,2.6-0.2,3.9-0.4c151-32.5,344.3-38.3,516.9-15.7c94.8,12.4,179.8,32.7,252.8,60.2 diff --git a/addons/web_editor/static/shapes/Airy/07.svg b/addons/web_editor/static/shapes/Airy/07.svg index 6ef5b2e1bbf..de8da864f4e 100644 --- a/addons/web_editor/static/shapes/Airy/07.svg +++ b/addons/web_editor/static/shapes/Airy/07.svg @@ -68,6 +68,9 @@ .st65{fill:none;stroke:#7C6576;stroke-width:0.303;stroke-miterlimit:10;} .st66{fill:none;stroke:#7C6576;stroke-width:0.2765;stroke-miterlimit:10;} .st67{fill:none;stroke:#7C6576;stroke-width:0.25;stroke-miterlimit:10;} + @media only screen and (max-width: 300px) { + .st0{opacity:.7;} + } </style> <g class="st0"> <path class="st1" d="M1028.5,0c-32.5,93-54.7,134.5-81.4,169.6c-25.8,33.7-56.7,63.2-91.6,87.4c-33.6,23.5-72.6,43.7-115.7,60 diff --git a/addons/web_editor/static/shapes/Airy/08.svg b/addons/web_editor/static/shapes/Airy/08.svg index d968eed3894..15cb46b7f56 100644 --- a/addons/web_editor/static/shapes/Airy/08.svg +++ b/addons/web_editor/static/shapes/Airy/08.svg @@ -18,6 +18,9 @@ .st15{fill:none;stroke:#3AADAA;stroke-width:3.9933;stroke-miterlimit:10;} .st16{fill:none;stroke:#3AADAA;stroke-width:3.9214;stroke-miterlimit:10;} .st17{fill:none;stroke:#3AADAA;stroke-width:3.8495;stroke-miterlimit:10;} + @media only screen and (max-width: 300px) { + .st0{opacity:.7;} + } </style> <g class="st0"> <polyline class="st1" points="141.6,570 454,301.9 1404.8,185.5"/> diff --git a/addons/web_editor/static/shapes/Airy/09.svg b/addons/web_editor/static/shapes/Airy/09.svg index 4428484e70e..d4e140ace57 100644 --- a/addons/web_editor/static/shapes/Airy/09.svg +++ b/addons/web_editor/static/shapes/Airy/09.svg @@ -18,6 +18,9 @@ .st15{fill:none;stroke:#3AADAA;stroke-width:3.9933;stroke-miterlimit:10;} .st16{fill:none;stroke:#3AADAA;stroke-width:3.9214;stroke-miterlimit:10;} .st17{fill:none;stroke:#3AADAA;stroke-width:3.8495;stroke-miterlimit:10;} + @media only screen and (max-width: 300px) { + .st0{opacity:.7;} + } </style> <g class="st0"> <polyline class="st1" points="141.6,0 454,517.9 2.5,570"/> diff --git a/addons/web_editor/static/shapes/Airy/10.svg b/addons/web_editor/static/shapes/Airy/10.svg index 0bacc5cce36..f646839b3e8 100644 --- a/addons/web_editor/static/shapes/Airy/10.svg +++ b/addons/web_editor/static/shapes/Airy/10.svg @@ -2,6 +2,9 @@ <style type="text/css"> .st0{opacity:0.21;} .st1{fill:none;stroke:#383E45;stroke-width:2;stroke-miterlimit:10;} + @media only screen and (max-width: 300px) { + .st0{opacity:.7;} + } </style> <g class="st0"> <line class="st1" x1="0" y1="568.9" x2="1397.4" y2="0"/> diff --git a/addons/web_editor/static/shapes/Airy/11.svg b/addons/web_editor/static/shapes/Airy/11.svg index e96acfcc008..11265f1726e 100644 --- a/addons/web_editor/static/shapes/Airy/11.svg +++ b/addons/web_editor/static/shapes/Airy/11.svg @@ -1,24 +1,50 @@ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1400 570"> - <g style="opacity: 0.209999993443489"> - <line x1="1394.5" style="fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 2px"/> - <line y1="569" x2="1397.3" style="fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 2px"/> - <line x1="1394.6" y1="63.8" style="fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.8889000415802px"/> - <line y1="569" x2="1397.3" y2="62.8" style="fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.8889000415802px"/> - <line x1="1394.6" y1="127" style="fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.77779996395111px"/> - <line y1="569" x2="1397.3" y2="126" style="fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.77779996395111px"/> - <line x1="1394.6" y1="190.2" style="fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.66670000553131px"/> - <line y1="569" x2="1397.3" y2="189.2" style="fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.66670000553131px"/> - <line x1="1394.6" y1="253.4" style="fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.55560004711151px"/> - <line y1="569" x2="1397.3" y2="252.4" style="fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.55560004711151px"/> - <line x1="1394.6" y1="316.6" style="fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.44439995288849px"/> - <line y1="569" x2="1397.3" y2="315.6" style="fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.44439995288849px"/> - <line x1="1394.6" y1="379.8" style="fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.33329999446869px"/> - <line y1="569" x2="1397.3" y2="378.8" style="fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.33329999446869px"/> - <line x1="1394.6" y1="443" style="fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.22220003604889px"/> - <line x1="4.8" y1="569" x2="1400" y2="442" style="fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.22220003604889px"/> - <line x1="1394.6" y1="506" style="fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.1110999584198px"/> - <line x1="5.2" y1="569" x2="1400" y2="505" style="fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.1110999584198px"/> - <line x1="1394.6" y1="570" style="fill: none;stroke: #383e45;stroke-miterlimit: 10"/> - <line x1="5.4" y1="569" x2="1400" y2="568" style="fill: none;stroke: #383e45;stroke-miterlimit: 10"/> + <style type="text/css"> + .st0{fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 2px} + .st1{fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 2px} + .st2{fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.8889000415802px} + .st3{fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.8889000415802px} + .st4{fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.77779996395111px} + .st5{fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.77779996395111px} + .st6{fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.66670000553131px} + .st7{fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.66670000553131px} + .st8{fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.55560004711151px} + .st9{fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.55560004711151px} + .st10{fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.44439995288849px} + .st11{fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.44439995288849px} + .st12{fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.33329999446869px} + .st13{fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.33329999446869px} + .st14{fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.22220003604889px} + .st15{fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.22220003604889px} + .st16{fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.1110999584198px} + .st17{fill: none;stroke: #383e45;stroke-miterlimit: 10;stroke-width: 1.1110999584198px} + .st18{fill: none;stroke: #383e45;stroke-miterlimit: 10} + .st19{fill: none;stroke: #383e45;stroke-miterlimit: 10} + .op0{opacity: 0.21} + @media only screen and (max-width: 300px) { + .op0{opacity:.7;} + } + </style> + <g class="op0"> + <line x1="1394.5" class="st0"/> + <line y1="569" x2="1397.3" class="st1"/> + <line x1="1394.6" y1="63.8" class="st2"/> + <line y1="569" x2="1397.3" y2="62.8" class="st3"/> + <line x1="1394.6" y1="127" class="st4"/> + <line y1="569" x2="1397.3" y2="126" class="st5"/> + <line x1="1394.6" y1="190.2" class="st6"/> + <line y1="569" x2="1397.3" y2="189.2" class="st7"/> + <line x1="1394.6" y1="253.4" class="st8"/> + <line y1="569" x2="1397.3" y2="252.4" class="st9"/> + <line x1="1394.6" y1="316.6" class="st10"/> + <line y1="569" x2="1397.3" y2="315.6" class="st11"/> + <line x1="1394.6" y1="379.8" class="st12"/> + <line y1="569" x2="1397.3" y2="378.8" class="st13"/> + <line x1="1394.6" y1="443" class="st14"/> + <line x1="4.8" y1="569" x2="1400" y2="442" class="st15"/> + <line x1="1394.6" y1="506" class="st16"/> + <line x1="5.2" y1="569" x2="1400" y2="505" class="st17"/> + <line x1="1394.6" y1="570" class="st18"/> + <line x1="5.4" y1="569" x2="1400" y2="568" class="st19"/> </g> </svg> diff --git a/addons/web_editor/static/shapes/Blobs/02.svg b/addons/web_editor/static/shapes/Blobs/02.svg index fe85cacf717..c1eb92fd8ba 100644 --- a/addons/web_editor/static/shapes/Blobs/02.svg +++ b/addons/web_editor/static/shapes/Blobs/02.svg @@ -1,14 +1,4 @@ -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="none" width="100%" height="100%"> - <defs> - <svg id="sub-svg-1" viewBox="0 0 1400 570" preserveAspectRatio="xMinYMin meet" width="100%"> - <path d="M369.43,124.68C336.43,27.2,97.76-8.32,0,50.19V460.86L233.22,338c76.51-39,129.15-86.89,139.11-158.09C375.06,160.37,371.82,131.73,369.43,124.68Z" style="fill: #3aadaa"/> - </svg> - <svg id="sub-svg-2" viewBox="0 0 1400 570" preserveAspectRatio="xMaxYMax meet" width="100%"> - <path d="M700,570c-26.9-67.52-45.18-140.6-37.8-206.5,4.38-39.07,49.34-104.23,104.22-141.5A507.52,507.52,0,0,1,891.2,160.73C1053,106.87,1225.58,79,1400,78.86h0V570Z" style="fill: #7c6576"/> - </svg> - </defs> - <svg> - <use xlink:href="#sub-svg-1"/> - <use xlink:href="#sub-svg-2"/> - </svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -830 1400 1400"> + <path d="M369.43,124.68C336.43,27.2,97.76-8.32,0,50.19V460.86L233.22,338c76.51-39,129.15-86.89,139.11-158.09C375.06,160.37,371.82,131.73,369.43,124.68Z" style="fill: #3aadaa"/> + <path d="M700,570c-26.9-67.52-45.18-140.6-37.8-206.5,4.38-39.07,49.34-104.23,104.22-141.5A507.52,507.52,0,0,1,891.2,160.73C1053,106.87,1225.58,79,1400,78.86h0V570Z" style="fill: #7c6576"/> </svg> diff --git a/addons/web_editor/static/shapes/Blocks/01.svg b/addons/web_editor/static/shapes/Blocks/01.svg index fa400a12c34..f7a2faea992 100644 --- a/addons/web_editor/static/shapes/Blocks/01.svg +++ b/addons/web_editor/static/shapes/Blocks/01.svg @@ -1,25 +1,26 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Generator: Adobe Illustrator 24.1.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - viewBox="0 -830 1400 1400" xml:space="preserve"> + viewBox="0 0 1400 570" xml:space="preserve"> <style type="text/css"> .st0{fill:url(#SVGID_1_);} - .st1{opacity:0.13;fill:#3AADAA;enable-background:new ;} - .st2{opacity:0.1;fill:#383E45;enable-background:new ;} - .st3{opacity:0.44;fill:#383E45;enable-background:new ;} - .st4{opacity:0.44;fill:#3AADAA;enable-background:new ;} - .st5{opacity:0.13;fill:#383E45;enable-background:new ;} + .st1{opacity:0.44;fill:#383E45;enable-background:new ;} + .st2{opacity:0.17;fill:#383E45;enable-background:new ;} + .st3{opacity:0.13;fill:#383E45;enable-background:new ;} + .st4{opacity:.07;fill:#F6F6F6;enable-background:new ;} + .st5{opacity:0.13;fill:#3AADAA;enable-background:new ;} + .st6{opacity:0.44;fill:#3AADAA;enable-background:new ;} </style> -<radialGradient id="SVGID_1_" cx="1517.8101" cy="1258.9148" r="1750.687" gradientTransform="matrix(1 0 0 1 0 -452)" gradientUnits="userSpaceOnUse"> +<radialGradient id="SVGID_1_" cx="1516.38" cy="335.54" r="1778.8101" gradientTransform="matrix(1 0 0 -1 0 572)" gradientUnits="userSpaceOnUse"> <stop offset="0" style="stop-color:#F6F6F6"/> <stop offset="0.35" style="stop-color:#3AADAA"/> <stop offset="0.99" style="stop-color:#383E45"/> </radialGradient> -<polygon class="st0" points="0,246.6 1400,0 1400,570 0,570 "/> -<polygon class="st1" points="753.4,570 1118,505.7 1118,416.2 753.4,480.5 "/> -<polygon class="st2" points="306.9,282.1 906.4,176.3 906.4,87 306.9,192.6 "/> -<polygon class="st1" points="712.6,300 1156.6,221.7 1156.6,132.3 712.6,210.5 "/> -<polygon class="st3" points="0,570 0,568 281.9,518.3 281.9,570 "/> -<polygon class="st4" points="1098.2,570 1400,516.8 1400,570 "/> -<polygon class="st5" points="518.4,476.6 518.4,570 281.9,570 281.9,518.3 "/> +<polygon class="st0" points="1400,323 0,570 0,0 1400,0 "/> +<polygon class="st1" points="0,0 0.2,90.6 281.9,42.1 281.9,0 "/> +<polygon class="st2" points="364.6,88.5 0,144.1 0,233.6 364.6,177.9 "/> +<polygon class="st3" points="518.4,0 281.9,0 281.9,42.1 "/> +<polygon class="st4" points="599.5,291.9 0,397.6 0,487 599.5,381.3 "/> +<polygon class="st5" points="871.1,154.5 427.1,232.8 427.1,322.3 871.1,244 "/> +<polygon class="st6" points="1098.1,0 1079,3.4 1079,92.8 1400,36.6 1400,0 "/> </svg> diff --git a/addons/web_editor/static/shapes/Blocks/02.svg b/addons/web_editor/static/shapes/Blocks/02.svg index bc94a25f3b0..571f8827196 100644 --- a/addons/web_editor/static/shapes/Blocks/02.svg +++ b/addons/web_editor/static/shapes/Blocks/02.svg @@ -1,26 +1,25 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Generator: Adobe Illustrator 24.1.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - viewBox="0 0 1400 1400" xml:space="preserve"> + viewBox="0 0 1400 570" xml:space="preserve"> <style type="text/css"> .st0{fill:url(#SVGID_1_);} - .st1{opacity:0.44;fill:#383E45;enable-background:new ;} - .st2{opacity:0.17;fill:#383E45;enable-background:new ;} - .st3{opacity:0.13;fill:#383E45;enable-background:new ;} - .st4{opacity:7.000000e-02;fill:#F6F6F6;enable-background:new ;} - .st5{opacity:0.13;fill:#3AADAA;enable-background:new ;} - .st6{opacity:0.44;fill:#3AADAA;enable-background:new ;} + .st1{opacity:0.13;fill:#3AADAA;enable-background:new ;} + .st2{opacity:0.1;fill:#383E45;enable-background:new ;} + .st3{opacity:0.44;fill:#383E45;enable-background:new ;} + .st4{opacity:0.44;fill:#3AADAA;enable-background:new ;} + .st5{opacity:0.13;fill:#383E45;enable-background:new ;} </style> -<radialGradient id="SVGID_1_" cx="1516.38" cy="335.54" r="1778.8101" gradientTransform="matrix(1 0 0 -1 0 572)" gradientUnits="userSpaceOnUse"> +<radialGradient id="SVGID_1_" cx="1517.8101" cy="1258.9148" r="1750.687" gradientTransform="matrix(1 0 0 1 0 -452)" gradientUnits="userSpaceOnUse"> <stop offset="0" style="stop-color:#F6F6F6"/> <stop offset="0.35" style="stop-color:#3AADAA"/> <stop offset="0.99" style="stop-color:#383E45"/> </radialGradient> -<polygon class="st0" points="1400,323 0,570 0,0 1400,0 "/> -<polygon class="st1" points="0,0 0.2,90.6 281.9,42.1 281.9,0 "/> -<polygon class="st2" points="364.6,88.5 0,144.1 0,233.6 364.6,177.9 "/> -<polygon class="st3" points="518.4,0 281.9,0 281.9,42.1 "/> -<polygon class="st4" points="599.5,291.9 0,397.6 0,487 599.5,381.3 "/> -<polygon class="st5" points="871.1,154.5 427.1,232.8 427.1,322.3 871.1,244 "/> -<polygon class="st6" points="1098.1,0 1079,3.4 1079,92.8 1400,36.6 1400,0 "/> +<polygon class="st0" points="0,246.6 1400,0 1400,570 0,570 "/> +<polygon class="st1" points="753.4,570 1118,505.7 1118,416.2 753.4,480.5 "/> +<polygon class="st2" points="306.9,282.1 906.4,176.3 906.4,87 306.9,192.6 "/> +<polygon class="st1" points="712.6,300 1156.6,221.7 1156.6,132.3 712.6,210.5 "/> +<polygon class="st3" points="0,570 0,568 281.9,518.3 281.9,570 "/> +<polygon class="st4" points="1098.2,570 1400,516.8 1400,570 "/> +<polygon class="st5" points="518.4,476.6 518.4,570 281.9,570 281.9,518.3 "/> </svg> diff --git a/addons/web_editor/static/shapes/Origins/01.svg b/addons/web_editor/static/shapes/Origins/01.svg index 3be333e1eef..c4da4872847 100644 --- a/addons/web_editor/static/shapes/Origins/01.svg +++ b/addons/web_editor/static/shapes/Origins/01.svg @@ -1,13 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 24.1.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> -<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - viewBox="0 0 1400 1140" style="enable-background:new 0 0 1400 1140;" xml:space="preserve"> -<style type="text/css"> - .st0{fill:url(#SVGID_1_);} -</style> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1400 1120"> <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="666.0453" y1="181.2743" x2="869.2076" y2="2447.3162"> - <stop offset="0" style="stop-color:#7C6576"/> - <stop offset="1" style="stop-color:#383E45"/> + <stop offset="0" style="stop-color:#7C6576"/> + <stop offset="1" style="stop-color:#383E45"/> </linearGradient> -<polygon class="st0" points="0,0 0,1120 1400,873.1 1400,0 "/> +<polygon style="fill:url(#SVGID_1_)" points="0,0 0,1120 1400,873.1 1400,0 "/> </svg> diff --git a/addons/web_editor/static/shapes/Origins/11.svg b/addons/web_editor/static/shapes/Origins/11.svg index 0e779b331bd..8e2970b759d 100644 --- a/addons/web_editor/static/shapes/Origins/11.svg +++ b/addons/web_editor/static/shapes/Origins/11.svg @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Generator: Adobe Illustrator 24.1.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" - viewBox="0 -1049.9 1400 1400" style="enable-background:new 0 0 1400 350.1;" xml:space="preserve"> + viewBox="0 0 1400 2800" style="enable-background:new 0 0 1400 350.1;" xml:space="preserve"> <style type="text/css"> .st0{fill:url(#SVGID_1_);} </style> @@ -9,5 +9,5 @@ <stop offset="0" style="stop-color:#F6F6F6"/> <stop offset="1" style="stop-color:#383E45"/> </linearGradient> -<path class="st0" d="M1400,6.9C913.6,43.8,445.1,47.2,0,6.9v343.2h1400V6.9z"/> +<path class="st0" d="M1400,0C913.6,36.9,445.1,40.3,0,0v2800h1400V0z"/> </svg> diff --git a/addons/web_editor/static/shapes/Rainy/04.svg b/addons/web_editor/static/shapes/Rainy/04.svg index 4c9b17081d0..6104a16d5ff 100644 --- a/addons/web_editor/static/shapes/Rainy/04.svg +++ b/addons/web_editor/static/shapes/Rainy/04.svg @@ -3,22 +3,22 @@ <stop offset="0" style="stop-color:#383E45"/> <stop offset="1" style="stop-color:#3AADAA"/> </linearGradient> -<path d="M1400.7,0H0l0,193.7c0,10.4,8.4,18.7,18.8,18.8h0.4c10.4,0,18.7-8.4,18.8-18.8v-7.5c0-10.4,8.4-18.7,18.8-18.8 - h0.4c10.4,0,18.7,8.4,18.8,18.8v40c0,10.4,8.4,18.7,18.8,18.8H95c10.4,0,18.7-8.4,18.8-18.8v-2.8c0-10.4,8.4-18.8,18.8-18.8h0.4 +<path d="M1400.7,0H0v60.8c0,10.4,8.4,18.7,18.8,18.8h0.4c10.4,0,18.7-8.4,18.8-18.8v-7.5c0-10.4,8.4-18.7,18.8-18.8h0.4 + c10.4,0,18.7,8.4,18.8,18.8v40c0,10.4,8.4,18.7,18.8,18.8H95c10.4,0,18.7-8.4,18.8-18.8v-2.8c0-10.4,8.4-18.8,18.8-18.8h0.4 c8.9,0,16.6,6.2,18.4,14.9v56c0,10.4,8.4,18.7,18.8,18.8h0.4c10.4,0,18.7-8.4,18.8-18.8l0.4-68.5c1.8-8.7,9.5-14.9,18.3-14.9h0.4 c10.4,0,18.7,8.4,18.8,18.8v44.1c0,10.4,8.4,18.8,18.8,18.8h0.4c10.4,0,18.7-8.4,18.7-18.8v-15.6c0-10.4,8.4-18.7,18.8-18.8h0.4 c10.4,0,18.7,8.4,18.8,18.8l0,0v48.8c0,10.4,8.4,18.8,18.8,18.8h0.4c10.4,0,18.7-8.4,18.8-18.8v-7.5c0-10.3,8.4-18.7,18.7-18.8h0.4 - c10.4,0,18.7,8.4,18.8,18.8v40c0,10.4,8.4,18.7,18.8,18.8h0.4c10.4,0,18.7-8.4,18.8-18.8v-2.8c0-10.4,8.4-18.7,18.8-18.8h0.4 + c10.4,0,18.7,8.4,18.8,18.8v40c0,10.4,8.4,18.7,18.8,18.8h0.4c10.4,0,18.7-8.4,18.8-18.8V185c0-10.4,8.4-18.7,18.8-18.8h0.4 c8.9,0,16.5,6.3,18.4,14.9v56c0,10.4,8.4,18.8,18.8,18.8h0.4c10.4,0,18.7-8.4,18.8-18.8l0.4-68.5c1.9-8.7,9.5-14.9,18.3-14.9h0.4 - c10.4,0,18.7,8.4,18.8,18.8v44.1c0,10.4,8.4,18.8,18.8,18.8h0.4c10.4,0,18.7-8.4,18.8-18.8v-15.6c0-10.4,8.4-18.8,18.8-18.8h0.4 + c10.4,0,18.7,8.4,18.8,18.8v44.1c0,10.4,8.4,18.8,18.8,18.8h0.4c10.4,0,18.7-8.4,18.8-18.8V201c0-10.4,8.4-18.8,18.8-18.8h0.4 c9.2,0,17,6.7,18.5,15.7l0.3,58c0,10.4,8.4,18.7,18.8,18.8h0.4c10.4,0,18.7-8.4,18.8-18.8v-56c1.8-8.7,9.5-14.9,18.3-14.9h0.4 c10.4,0,18.7,8.4,18.8,18.8v2.8c0,10.4,8.4,18.8,18.8,18.8h0.4c10.4,0,18.7-8.4,18.8-18.8v-40c0-10.4,8.4-18.8,18.8-18.8h0.4 c10.4,0,18.7,8.4,18.8,18.8v7.5c0,10.4,8.4,18.8,18.8,18.8h0.4c10.2,0,18.6-8.3,18.7-18.5v-2.9c0-10.4,8.4-18.8,18.8-18.8h0.4 c9.7,0,17.8,7.4,18.7,17.1c0.1,0.6,0.1,17.5,0.1,17.5c0,10.4,8.4,18.7,18.8,18.8h0.4c10.4,0,18.7-8.4,18.8-18.8v-44.1 c0-10.4,8.4-18.8,18.8-18.8h0.4c8.9,0,16.5,6.2,18.3,14.9l0.4,68.5c0,10.4,8.4,18.8,18.8,18.8h0.4c10.4,0,18.7-8.4,18.8-18.8v-56 c1.8-8.7,9.5-14.9,18.4-14.9h0.4c10.4,0,18.7,8.4,18.8,18.8v2.8c0,10.4,8.4,18.7,18.8,18.8h0.4c10.4,0,18.7-8.4,18.8-18.8v-40 - c0-10.4,8.4-18.7,18.8-18.8h0.4c10.4,0,18.7,8.4,18.8,18.8v7.5c0,10.4,8.4,18.8,18.8,18.8h0.4c10.4,0,18.7-8.4,18.7-18.8V210l0,0 - c0-10.4,8.4-18.7,18.8-18.8h0.4c10.4,0,18.7,8.4,18.8,18.8v15.6c0,10.4,8.4,18.8,18.8,18.8h0.4c10.4,0,18.7-8.4,18.8-18.8v-44.1 + c0-10.4,8.4-18.7,18.8-18.8h0.4c10.4,0,18.7,8.4,18.8,18.8v7.5c0,10.4,8.4,18.8,18.8,18.8h0.4c10.4,0,18.7-8.4,18.7-18.8V77.1l0,0 + c0-10.4,8.4-18.7,18.8-18.8h0.4c10.4,0,18.7,8.4,18.8,18.8v15.6c0,10.4,8.4,18.8,18.8,18.8h0.4c10.4,0,18.7-8.4,18.8-18.8V48.6 c0-10.3,8.4-18.7,18.7-18.7h0.4c8.9,0,16.5,6.2,18.3,14.9l0.4,68.5c0,10.3,8.4,18.7,18.7,18.7h0.4c10.4,0,18.7-8.4,18.8-18.8v-56 c1.8-8.7,9.5-14.9,18.3-14.9h0.4c10.4,0,18.7,8.4,18.8,18.8v2.8c0,10.4,8.4,18.7,18.8,18.8h0.4c10.4,0,18.7-8.4,18.8-18.8v-40 c0-10.4,8.4-18.7,18.8-18.8h0.4c10.4,0,18.7,8.4,18.8,18.8v7.5c0,10.4,8.4,18.7,18.8,18.8h0.4c10.4,0,18.7-8.4,18.8-18.8L1400.7,0z" style="fill:url(#SVGID_1_)" diff --git a/addons/web_editor/static/shapes/Wavy/07.svg b/addons/web_editor/static/shapes/Wavy/07.svg index 9bb2d935400..5eef15db1d4 100644 --- a/addons/web_editor/static/shapes/Wavy/07.svg +++ b/addons/web_editor/static/shapes/Wavy/07.svg @@ -1,4 +1,4 @@ -<svg id="Waves" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1400 1400"> +<svg id="Waves" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 75 1400 1400"> <g> <image width="1461" height="318" transform="translate(-30.48 -25.98)" xlink:href="data:image/png;base64,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" style="opacity: 0.300000011920929;"/> <path d="M0,214C283.4,354.43,559.74,107.59,1066,81.82c175.62-8.93,333.11,36.92,334,37.18V0H0Z" style="fill: #f6f6f6"/> diff --git a/addons/web_editor/static/shapes/Wavy/09.svg b/addons/web_editor/static/shapes/Wavy/09.svg index 80e92589f82..9a6ff367895 100644 --- a/addons/web_editor/static/shapes/Wavy/09.svg +++ b/addons/web_editor/static/shapes/Wavy/09.svg @@ -10,9 +10,10 @@ </linearGradient> <linearGradient id="linear-gradient-3" x1="-439.37" y1="6258.49" x2="1539.51" y2="5035.85" xlink:href="#linear-gradient-2"/> </defs> - <path d="M1400,570H1.13V416.16C1.13,378.93,0,302.68,0,302.68S98.19,106,257.36,106c61.3,0,117,38,163.13,78.44S504.08,274,542.18,322c16.2,20.48,35.35,42.4,61.33,45,9,.9,18.09-.7,27-2.29,26.61-4.74,54.2-12.68,81-15,91.36-7.8,183.26,55.36,270.67,27.69,26.89-8.51,50.55-25.09,77-34.75,38.82-14.15,82.82-12.51,121.17,2.88,33,13.23,105.79,38.7,138.69,52.06,11,4.47,42.66-.71,50.2-32.37,11.15-46.88,30.73-56.93,30.73-56.93V570Z" style="opacity: 0.300000011920929;isolation: isolate;fill: url(#linear-gradient)"/> + <path d="M1400,570H1.13V416.16C1.13,378.93,0,302.68,0,302.68S98.19,106,257.36,106c61.3,0,117,38,163.13,78.44S504.08,274,542.18,322c16.2,20.48,35.35,42.4,61.33,45,9,.9,18.09-.7,27-2.29,26.61-4.74,54.2-12.68,81-15,91.36-7.8,183.26,55.36,270.67,27.69,26.89-8.51,50.55-25.09,77-34.75,38.82-14.15,82.82-12.51,121.17,2.88,33,13.23,105.79,38.7,138.69,52.06,11,4.47,42.66-.71,50.2-32.37,11.15-46.88,30.73-56.93,30.73-56.93V570Z" style="opacity: 0.3;isolation: isolate;fill: url(#linear-gradient)"/> <path d="M0,371.52S64.07,295.57,155.93,266s206.86-40.41,323.85,96.73C565.91,463.73,668,475.9,752.25,411.1c130.17-100.17,250.67-35.54,294.27-2s105.35,40.06,201.74-14.81c73.26-41.71,85.52-55,151.74-39V570H.24Z" style="fill: url(#linear-gradient-2)"/> - <path d="M1400,362.82c-61.32-20.36-111.17,15.54-199.28,67.11-87.5,51.21-168.06-7-211.7-31.7S856.63,361.7,741.37,445.29,523.31,440.67,496.8,418,396.2,292.22,258.54,295.57,0,439.69,0,439.69V570H1399.81Z" style="opacity: 0.300000011920929;isolation: isolate;fill: url(#linear-gradient-3)"/> + <path d="M1400,362.82c-61.32-20.36-111.17,15.54-199.28,67.11-87.5,51.21-168.06-7-211.7-31.7S856.63,361.7,741.37,445.29,523.31,440.67,496.8,418,396.2,292.22,258.54,295.57,0,439.69,0,439.69V570H1399.81Z" style="opacity: 0.3;isolation: isolate;fill: url(#linear-gradient-3)"/> <path d="M0,413s77.49-38.25,129.46-41.51c211.75-13.28,290,112.59,387.64,146.42,246,99.43,269.4-100,457.8-107.87,110.12-4.61,169.7,63.18,264.68,62.19S1400,410,1400,410V570H.24Z" style="fill: #3aadaa;opacity: 0.639999985694885;isolation: isolate"/> - <path d="M0,477.2S139.1,338.88,273.1,342c208.39,4.8,195.33,179.66,371.76,175.93,72.64-4.3,116.11-51.37,169.32-81.88,128.51-73.69,202.68,16.26,268.68,31.81,99.44,23.42,127.41-24,227.18-79.35,13.4-7.43,41.87-22.45,90-12.45V570H.24Z" style="fill: #3aadaa;opacity: 0.28999999165535;isolation: isolate"/> + <path d="M0,477.2S139.1,338.88,273.1,342c208.39,4.8,195.33,179.66,371.76,175.93,72.64-4.3,116.11-51.37,169.32-81.88,128.51-73.69,202.68,16.26,268.68,31.81,99.44,23.42,127.41-24,227.18-79.35,13.4-7.43,41.87-22.45,90-12.45V570H.24Z" style="fill: #3aadaa;opacity: 0.29;isolation: isolate"/> + <path d="M1239.6,472.2c-20.9,0.2-40-2.9-58.3-7.8c-27.2,10.6-56.5,13.3-98.4,3.4c-38.3-9-79.3-43-132-55.7C784,435,752.2,612.9,517.1,517.9c-93.9-32.5-169.8-150.1-363.7-147.3C69.2,409.4,2.9,474.3,0.1,477.1L0.2,570H1400V410C1400,410,1334.6,471.2,1239.6,472.2z" style="fill: #3aadaa;isolation: isolate"/> </svg> diff --git a/addons/web_editor/static/shapes/Wavy/12.svg b/addons/web_editor/static/shapes/Wavy/12.svg index abeec77fce4..f4bc8ccc834 100644 --- a/addons/web_editor/static/shapes/Wavy/12.svg +++ b/addons/web_editor/static/shapes/Wavy/12.svg @@ -1,4 +1,6 @@ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1400 570"> - <path d="M1400,532.82S1142.27,468,989,493.34c-219,36.28-328.19,65.3-577.68,30.14C277.25,504.58,40.2,476.34,0,492.82V0H1400Z" style="fill: #3aadaa;opacity: 0.079999998211861;isolation: isolate"/> - <path d="M1400,492.82S1203.77,520,1042.62,515.11,804.87,483.61,664.22,491s-427,38.62-547.53,40.58S0,532.82,0,532.82V0H1400Z" style="fill: #3aadaa;opacity: 0.079999998211861;isolation: isolate"/> + <path d="M1400,562.4c0,0-257.7-64.8-411-39.5c-219,36.3-328.2,65.3-577.7,30.1C277.2,534.2,40.2,506,0,522.4V0h1400 + V562.4z" style="fill: #3aadaa;opacity:.08;isolation: isolate"/> + <path d="M1400,523.4c0,0-196.2,27.2-357.4,22.3s-237.8-31.5-378.4-24.1s-427,38.6-547.5,40.6S0,563.4,0,563.4V0h1400 + V523.4z" style="fill: #3aadaa;opacity:.08;isolation: isolate"/> </svg> diff --git a/addons/web_editor/static/shapes/Wavy/13.svg b/addons/web_editor/static/shapes/Wavy/13.svg index 23d85824dfc..d8c218f3aba 100644 --- a/addons/web_editor/static/shapes/Wavy/13.svg +++ b/addons/web_editor/static/shapes/Wavy/13.svg @@ -1,21 +1,20 @@ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -830 1400 1400"> -<path class="st0" d="M1360.2,448.8L1360.2,448.8c-3.9-3.9-10.2-3.9-14.1,0c0,0,0,0,0,0l-9.2,9.2c-6.2,6.2-16.3,6.2-22.5,0 - c0,0,0,0,0,0l0,0c-6.7-6.7-17.6-6.7-24.4,0c0,0,0,0,0,0l0,0c-3.9,3.9-10.2,3.9-14.1,0l-12.2-12.2c-6.9-6.9-18.1-6.9-25.1,0 - c0,0,0,0,0,0l0,0c-2.8,2.8-7.3,2.8-10.1,0l0,0c-3.9-3.9-10.2-3.9-14.1,0l-12.2,12.2c-3.9,3.9-10.2,3.9-14.1,0l-16-16 - c-7.7-7.7-20.1-7.8-27.8-0.2l0,0c-7.5,7.3-19.6,7.3-27-0.2l0,0c-7.4-7.4-19.5-7.5-27-0.1l-27.6,27.1c-7.3,7.3-19.2,7.3-26.5,0l0,0 - c-7.3-7.3-19.1-7.3-26.5,0c0,0,0,0,0,0l-4.8,4.8c-7.3,7.3-19.2,7.3-26.5,0l-0.9-0.9c-4.7-4.7-12.2-4.7-16.9,0l0,0 - c-7.8,7.8-20.5,7.8-28.3,0c0,0,0,0,0,0l-11.6-11.6c-6.9-6.9-18.2-7-25.1,0c0,0,0,0,0,0l-0.2,0.2c-2.2,2.2-5.8,2.2-8.1,0l-0.2-0.2 - c-7.8-7.8-20.5-7.8-28.3,0c0,0,0,0,0,0l-11.8,11.8c-1.9,1.9-4.9,1.9-6.8,0c0,0,0,0,0,0l-0.3-0.3c-2.6-2.6-6.8-2.7-9.4-0.1 - c0,0,0,0-0.1,0l-0.2,0.2c-7.8,7.8-20.5,7.8-28.3,0c0,0,0,0,0,0l-9.4-9.4c-7.8-7.8-20.5-7.8-28.3,0c0,0,0,0,0,0l-17.8,17.8 - c-3.1,3.2-8.3,3.2-11.4,0c0,0,0,0,0,0l-0.1-0.1c-2.5-2.5-6-3.5-9.4-2.7c-4.7,1.1-11.5,1.9-14.9-1.5l-24-24 - c-11.7-11.7-30.7-11.7-42.4,0l-9.2,9.4c-13.6,13.6-35.7,13.7-49.4,0c0,0,0,0,0,0l-0.5-0.5c-7.8-7.9-20.5-8-28.4-0.2c0,0,0,0-0.1,0.1 - l-18.1,18.1c-3.9,3.9-10.2,3.9-14.1,0l-0.5-0.5c-3.9-3.9-10.2-3.9-14.1,0l-0.5,0.5c-3.9,3.9-10.2,3.9-14.1,0c0,0,0,0,0,0l-6.7-6.7 - c-7.8-7.8-20.5-7.8-28.3,0c0,0,0,0,0,0l0,0c-4.3,4.3-10.3,6.4-16.3,5.7c-3.4-0.4-6.8-0.2-8.4,1.4l-0.3,0.3c-7.8,7.8-20.5,7.8-28.3,0 - l-18.8-18.7c-4.5-4.5-11.8-4.5-16.2,0c0,0,0,0,0,0l-0.3,0.3c-7.8,7.8-20.5,7.8-28.3,0c0,0,0,0,0,0l-0.9-0.9c-3.3-3.3-8.6-3.3-11.9,0 - l0,0c-2.4,2.4-5.7,3.4-9,2.7c-3.5-0.7-8.1-1-10.4,1.4l-0.3,0.3c-11.7,11.7-30.7,11.7-42.4,0L256.6,454c-2.4-2.4-6.4-2.5-8.9,0 - c0,0,0,0,0,0l-0.6,0.6c-5.9,5.9-15.4,5.9-21.2,0c0,0,0,0,0,0l-0.4-0.4c-7.8-7.8-20.5-7.8-28.3,0l-7.2,7.2c-2.1,2.1-5.5,2.1-7.6,0 - c0,0,0,0,0,0l0,0c-3.9-3.9-10.2-3.9-14.1,0l-7.6,7.6c-3.9,3.9-10.2,3.9-14.1,0l-14.7-14.8c-3.9-3.9-10.2-3.9-14.1,0l-7.7,7.7 - c-7.8,7.8-20.5,7.8-28.3,0c0,0,0,0,0,0l-11.3-11.3c-9.6-9.6-25.2-9.6-34.9,0l0,0c-3.9,3.9-10.2,3.9-14.1,0c0,0,0,0,0,0l-4.4-4.4 - c-3.9-3.9-10.2-3.9-14.1,0c-1.9,1.9-2.9,4.4-2.9,7.1V570h1400V451.2c0-5.5-4.5-10-10-10c-2.5,0-4.9,1-6.8,2.7l-5.4,5 - C1373,453.7,1365,453.7,1360.2,448.8C1360.2,448.8,1360.2,448.8,1360.2,448.8z" style="fill:#FFFFFF"/> +<path d="M1360.1,531.5L1360.1,531.5c-3.9-3.9-10.2-3.9-14.1,0l0,0l-9.2,9.2c-6.2,6.2-16.3,6.2-22.5,0l0,0l0,0 + c-6.7-6.7-17.6-6.7-24.4,0l0,0l0,0c-3.9,3.9-10.2,3.9-14.1,0l-12.2-12.2c-6.9-6.9-18.1-6.9-25.1,0l0,0l0,0c-2.8,2.8-7.3,2.8-10.1,0 + l0,0c-3.9-3.9-10.2-3.9-14.1,0l-12.2,12.2c-3.9,3.9-10.2,3.9-14.1,0l-16-16c-7.7-7.7-20.1-7.8-27.8-0.2l0,0 + c-7.5,7.3-19.6,7.3-27-0.2l0,0c-7.4-7.4-19.5-7.5-27-0.1l-27.6,27.1c-7.3,7.3-19.2,7.3-26.5,0l0,0c-7.3-7.3-19.1-7.3-26.5,0l0,0 + l-4.8,4.8c-7.3,7.3-19.2,7.3-26.5,0l-0.9-0.9c-4.7-4.7-12.2-4.7-16.9,0l0,0c-7.8,7.8-20.5,7.8-28.3,0l0,0l-11.6-11.6 + c-6.9-6.9-18.2-7-25.1,0l0,0l-0.2,0.2c-2.2,2.2-5.8,2.2-8.1,0l-0.2-0.2c-7.8-7.8-20.5-7.8-28.3,0l0,0l-11.8,11.8 + c-1.9,1.9-4.9,1.9-6.8,0l0,0l-0.3-0.3c-2.6-2.6-6.8-2.7-9.4-0.1c0,0,0,0-0.1,0l-0.2,0.2c-7.8,7.8-20.5,7.8-28.3,0l0,0l-9.4-9.4 + c-7.8-7.8-20.5-7.8-28.3,0l0,0l-17.8,17.8c-3.1,3.2-8.3,3.2-11.4,0l0,0l-0.1-0.1c-2.5-2.5-6-3.5-9.4-2.7c-4.7,1.1-11.5,1.9-14.9-1.5 + l-24-24c-11.7-11.7-30.7-11.7-42.4,0l-9.2,9.4c-13.6,13.6-35.7,13.7-49.4,0l0,0l-0.5-0.5c-7.8-7.9-20.5-8-28.4-0.2c0,0,0,0-0.1,0.1 + l-18.1,18.1c-3.9,3.9-10.2,3.9-14.1,0l-0.5-0.5c-3.9-3.9-10.2-3.9-14.1,0l-0.5,0.5c-3.9,3.9-10.2,3.9-14.1,0l0,0l-6.7-6.7 + c-7.8-7.8-20.5-7.8-28.3,0l0,0l0,0c-4.3,4.3-10.3,6.4-16.3,5.7c-3.4-0.4-6.8-0.2-8.4,1.4l-0.3,0.3c-7.8,7.8-20.5,7.8-28.3,0 + L388,544.2c-4.5-4.5-11.8-4.5-16.2,0l0,0l-0.3,0.3c-7.8,7.8-20.5,7.8-28.3,0l0,0l-0.9-0.9c-3.3-3.3-8.6-3.3-11.9,0l0,0 + c-2.4,2.4-5.7,3.4-9,2.7c-3.5-0.7-8.1-1-10.4,1.4l-0.3,0.3c-11.7,11.7-30.7,11.7-42.4,0l-11.8-11.3c-2.4-2.4-6.4-2.5-8.9,0l0,0 + l-0.6,0.6c-5.9,5.9-15.4,5.9-21.2,0l0,0l-0.4-0.4c-7.8-7.8-20.5-7.8-28.3,0l-7.2,7.2c-2.1,2.1-5.5,2.1-7.6,0l0,0l0,0 + c-3.9-3.9-10.2-3.9-14.1,0l-7.6,7.6c-3.9,3.9-10.2,3.9-14.1,0l-14.7-14.8c-3.9-3.9-10.2-3.9-14.1,0l-7.7,7.7 + c-7.8,7.8-20.5,7.8-28.3,0l0,0l-11.3-11.3c-9.6-9.6-25.2-9.6-34.9,0l0,0c-3.9,3.9-10.2,3.9-14.1,0l0,0l-4.4-4.4 + c-3.9-3.9-10.2-3.9-14.1,0C1,530.8,0,533.3,0,536v34h1400v-36.1c0-5.5-4.5-10-10-10c-2.5,0-4.9,1-6.8,2.7l-5.4,5 + C1372.9,536.4,1364.9,536.4,1360.1,531.5L1360.1,531.5z" style="fill:#FFFFFF"/> </svg> diff --git a/addons/web_editor/static/shapes/Wavy/20.svg b/addons/web_editor/static/shapes/Wavy/20.svg index 844f676ef88..b1dcd633b82 100644 --- a/addons/web_editor/static/shapes/Wavy/20.svg +++ b/addons/web_editor/static/shapes/Wavy/20.svg @@ -1,3 +1,4 @@ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -830 1400 1400"> - <path d="M1400,570H0V479.39c268.83,17.4,537.05,34.55,681.58,2.56,12.23-2.71,24.61-5,37.06-7.18,340.1-58.75,422.8-12.11,681.36,4.62Z" style="fill: #7c6576"/> + <path d="M1400,570H0v-23.6c268.8,17.4,537,34.5,681.6,2.6c12.2-2.7,24.6-5,37.1-7.2c340.1-58.8,422.8-12.1,681.4,4.6 + V570z" style="fill: #7c6576"/> </svg> diff --git a/addons/web_editor/static/shapes/Wavy/21.svg b/addons/web_editor/static/shapes/Wavy/21.svg index 06793184126..4c84882b9d7 100644 --- a/addons/web_editor/static/shapes/Wavy/21.svg +++ b/addons/web_editor/static/shapes/Wavy/21.svg @@ -1,3 +1,5 @@ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1400 1400"> - <path d="M0,0H1400l-1,76.59c-24.81-2.43-51.15,12-103.5,33.4-57.41,23.44-117.09,1.83-191.29-15.35-38-8.79-95.92-28.56-141.2-7.73-54.32,25-116.72,25.35-156.3,17.38C716.47,86.12,671.84,90.44,623,108.36c-97.94,35.92-105.31-15.11-224.48,22-57.39,17.88-151-9-173.79-17.92C142.32,80.17,106.86,115.54,0,114.89Z" style="fill: #7c6576"/> + <path d="M0,0L1400,0c-24.4,0-51.2,12.3-103.6,33.7c-57.5,23.4-117.2,1.8-191.4-15.4c-38-8.8-96-28.6-141.3-7.7 + c-54.4,25-116.8,25.3-156.4,17.4C717,9.8,672.3,14.1,623.4,32c-98,35.9-105.4-15.1-224.6,22c-57.4,17.9-151.1-9-173.9-17.9 + C142.4,3.8,106.9,39.2,0,38.6V0.3z" style="fill: #7c6576"/> </svg> diff --git a/addons/web_editor/static/src/js/editor/snippets.options.js b/addons/web_editor/static/src/js/editor/snippets.options.js index 23fe6ff1bfd..5b7aba79184 100644 --- a/addons/web_editor/static/src/js/editor/snippets.options.js +++ b/addons/web_editor/static/src/js/editor/snippets.options.js @@ -1680,7 +1680,6 @@ const SelectPagerUserValueWidget = SelectUserValueWidget.extend({ this.pageNum = document.createElement('span'); this.currentPage = 0; - this._updatePageNum(); const next = document.createElement('i'); next.classList.add('o_we_pager_next', 'fa', 'fa-chevron-right'); @@ -1691,9 +1690,16 @@ const SelectPagerUserValueWidget = SelectUserValueWidget.extend({ pagerControls.appendChild(this.pageNum); pagerControls.appendChild(next); + this.pageName = document.createElement('b'); + const pagerHeader = document.createElement('div'); + pagerHeader.classList.add('o_we_pager_header'); + pagerHeader.appendChild(this.pageName); + pagerHeader.appendChild(pagerControls); + await _super(...arguments); this.menuEl.classList.add('o_we_has_pager'); - $(this.menuEl).prepend(pagerControls); + $(this.menuEl).prepend(pagerHeader); + this._updatePage(); }, //-------------------------------------------------------------------------- @@ -1705,9 +1711,11 @@ const SelectPagerUserValueWidget = SelectUserValueWidget.extend({ * * @private */ - _updatePageNum() { + _updatePage() { this.pages.forEach((page, i) => page.classList.toggle('active', i === this.currentPage)); this.pageNum.textContent = `${this.currentPage + 1}/${this.numPages}`; + const activePage = this.pages.find((page, i) => i === this.currentPage); + this.pageName.textContent = activePage.getAttribute('string'); }, //-------------------------------------------------------------------------- @@ -1724,7 +1732,7 @@ const SelectPagerUserValueWidget = SelectUserValueWidget.extend({ ev.stopPropagation(); const delta = ev.target.matches('.o_we_pager_next') ? 1 : -1; this.currentPage = (this.currentPage + this.numPages + delta) % this.numPages; - this._updatePageNum(); + this._updatePage(); }, /** * @override @@ -1735,7 +1743,7 @@ const SelectPagerUserValueWidget = SelectUserValueWidget.extend({ const currentPage = this.pages.indexOf(activeButton.el.closest('we-select-page')); if (currentPage !== -1) { this.currentPage = currentPage; - this._updatePageNum(); + this._updatePage(); } } return this._super(...arguments); diff --git a/addons/web_editor/static/src/scss/web_editor.frontend.scss b/addons/web_editor/static/src/scss/web_editor.frontend.scss index 37ce7b974eb..39c96304361 100644 --- a/addons/web_editor/static/src/scss/web_editor.frontend.scss +++ b/addons/web_editor/static/src/scss/web_editor.frontend.scss @@ -60,6 +60,11 @@ } } } +@include media-breakpoint-down(sm) { + .o_we_shape { + display: none; + } +} .o_we_flip_x { transform: scaleX(-1); } 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 d777752fe06..321adeb7024 100644 --- a/addons/web_editor/static/src/scss/web_editor.variables.scss +++ b/addons/web_editor/static/src/scss/web_editor.variables.scss @@ -608,7 +608,7 @@ $o-bg-shapes: ('web_editor': ( 'Airy/13': ('position': bottom, 'size': 100% auto, 'colors': (1, 4), 'repeat-y': false), 'Airy/14': ('position': bottom, 'size': 100% auto, 'colors': (1, 4), 'repeat-y': false), 'Blobs/01': ('position': top, 'size': 100% auto, 'colors': (2), 'repeat-y': false), - 'Blobs/02': ('position': center, 'size': 100% 100%, 'colors': (1, 2), 'repeat-y': false), + 'Blobs/02': ('position': bottom, 'size': 100% auto, 'colors': (1, 2), 'repeat-y': false), 'Blobs/03': ('position': top, 'size': 100% auto, 'colors': (2), 'repeat-y': false), 'Blobs/04': ('position': center, 'size': 100% auto, 'colors': (5), 'repeat-y': false), 'Blobs/05': ('position': bottom, 'size': 100% auto, 'colors': (1), 'repeat-y': false), @@ -645,7 +645,7 @@ $o-bg-shapes: ('web_editor': ( 'Origins/08': ('position': bottom, 'size': 100% auto, 'colors': (3), 'repeat-y': false), 'Origins/09': ('position': top, 'size': 100% auto, 'colors': (1, 5), 'repeat-y': false), 'Origins/10': ('position': bottom, 'size': 100% auto, 'colors': (2, 5), 'repeat-y': false), - 'Origins/11': ('position': bottom, 'size': 100% auto, 'colors': (3, 5), 'repeat-y': false), + 'Origins/11': ('position': top, 'size': 100% auto, 'colors': (3, 5), 'repeat-y': false), 'Origins/12': ('position': top, 'size': 100% auto, 'colors': (3, 5), 'repeat-y': false), 'Origins/13': ('position': center, 'size': 100% auto, 'colors': (3, 5), 'repeat-y': false), 'Origins/14': ('position': bottom, 'size': 100% auto, 'colors': (4), 'repeat-y': false), diff --git a/addons/web_editor/static/src/scss/wysiwyg_snippets.scss b/addons/web_editor/static/src/scss/wysiwyg_snippets.scss index e50a728c93b..404646b0584 100644 --- a/addons/web_editor/static/src/scss/wysiwyg_snippets.scss +++ b/addons/web_editor/static/src/scss/wysiwyg_snippets.scss @@ -682,10 +682,18 @@ body.editor_enable.editor_has_snippets { } } } + .o_we_pager_header { + display: flex; + align-items: center; + justify-content: space-between; + + & > b { + padding: $o-we-sidebar-content-field-label-spacing; + } + } .o_we_pager_controls { display: flex; align-items: center; - padding: $o-we-sidebar-content-field-label-spacing; } .o_we_pager_next, .o_we_pager_prev { padding: $o-we-sidebar-content-field-label-spacing; @@ -1717,9 +1725,9 @@ we-select.o_we_shape_menu { width: 100%; } .o_we_shape_btn_content { + @extend %o-preview-alpha-background; width: 100%; height: 75px; - background-color: lightgray; // Must be a color which can make all shapes appear } } } diff --git a/addons/web_editor/views/snippets.xml b/addons/web_editor/views/snippets.xml index cc3986d2417..5edda5c1dfd 100644 --- a/addons/web_editor/views/snippets.xml +++ b/addons/web_editor/views/snippets.xml @@ -226,57 +226,7 @@ <we-select-pager class="o_we_shape_menu" string="⌙ Shape" data-dependencies="!shape_none_opt" data-name="bg_shape_opt"> <!-- Invisible None button to be used for select's placeholder text --> <we-button data-shape="" data-name="shape_none_opt"/> - <we-select-page> - <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"/> - <we-button data-shape="web_editor/Airy/04" data-select-label="Airy 04"/> - <we-button data-shape="web_editor/Airy/05" data-select-label="Airy 05"/> - <we-button data-shape="web_editor/Airy/06" data-select-label="Airy 06"/> - <we-button data-shape="web_editor/Airy/07" data-select-label="Airy 07"/> - <we-button data-shape="web_editor/Airy/08" data-select-label="Airy 08"/> - <we-button data-shape="web_editor/Airy/09" data-select-label="Airy 09"/> - <we-button data-shape="web_editor/Airy/10" data-select-label="Airy 10"/> - <we-button data-shape="web_editor/Airy/11" data-select-label="Airy 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-select-page> - <we-select-page> - <we-button data-shape="web_editor/Blobs/01" data-select-label="Blobs 01"/> - <we-button data-shape="web_editor/Blobs/02" data-select-label="Blobs 02"/> - <we-button data-shape="web_editor/Blobs/03" data-select-label="Blobs 03"/> - <we-button data-shape="web_editor/Blobs/04" data-select-label="Blobs 04"/> - <we-button data-shape="web_editor/Blobs/05" data-select-label="Blobs 05"/> - <we-button data-shape="web_editor/Blobs/06" data-select-label="Blobs 06"/> - <we-button data-shape="web_editor/Blobs/07" data-select-label="Blobs 07"/> - <we-button data-shape="web_editor/Blobs/08" data-select-label="Blobs 08"/> - <we-button data-shape="web_editor/Blobs/09" data-select-label="Blobs 09"/> - <we-button data-shape="web_editor/Blobs/10" data-select-label="Blobs 10"/> - <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> - <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-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-select-page> - <we-select-page> - <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/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"/> - <we-button data-shape="web_editor/Bold/10" data-select-label="Bold 10"/> - <we-button data-shape="web_editor/Bold/11" data-select-label="Bold 11"/> - <we-button data-shape="web_editor/Bold/12" data-select-label="Bold 12"/> - </we-select-page> - <we-select-page> + <we-select-page string="Origins"> <we-button data-shape="web_editor/Origins/01" data-select-label="Origins 01"/> <we-button data-shape="web_editor/Origins/02" data-select-label="Origins 02"/> <we-button data-shape="web_editor/Origins/03" data-select-label="Origins 03"/> @@ -293,18 +243,13 @@ <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> - <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" 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 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-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-select-page> - <we-select-page> + <we-select-page string="Wavy"> <we-button data-shape="web_editor/Wavy/01" data-select-label="Wavy 01"/> <we-button data-shape="web_editor/Wavy/02" data-select-label="Wavy 02"/> <we-button data-shape="web_editor/Wavy/03" data-select-label="Wavy 03"/> @@ -329,19 +274,76 @@ <we-button data-shape="web_editor/Wavy/22" data-select-label="Wavy 22"/> <we-button data-shape="web_editor/Wavy/23" data-select-label="Wavy 23"/> </we-select-page> - <we-select-page> + <we-select-page string="Blobs"> + <we-button data-shape="web_editor/Blobs/01" data-select-label="Blobs 01"/> + <we-button data-shape="web_editor/Blobs/02" data-select-label="Blobs 02"/> + <we-button data-shape="web_editor/Blobs/03" data-select-label="Blobs 03"/> + <we-button data-shape="web_editor/Blobs/04" data-select-label="Blobs 04"/> + <we-button data-shape="web_editor/Blobs/05" data-select-label="Blobs 05"/> + <we-button data-shape="web_editor/Blobs/06" data-select-label="Blobs 06"/> + <we-button data-shape="web_editor/Blobs/07" data-select-label="Blobs 07"/> + <we-button data-shape="web_editor/Blobs/08" data-select-label="Blobs 08"/> + <we-button data-shape="web_editor/Blobs/09" data-select-label="Blobs 09"/> + <we-button data-shape="web_editor/Blobs/10" data-select-label="Blobs 10"/> + <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" 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/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"/> + <we-button data-shape="web_editor/Bold/10" data-select-label="Bold 10"/> + <we-button data-shape="web_editor/Bold/11" 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-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"/> + <we-button data-shape="web_editor/Airy/04" data-select-label="Airy 04"/> + <we-button data-shape="web_editor/Airy/05" data-select-label="Airy 05"/> + <we-button data-shape="web_editor/Airy/06" data-select-label="Airy 06"/> + <we-button data-shape="web_editor/Airy/07" data-select-label="Airy 07"/> + <we-button data-shape="web_editor/Airy/08" data-select-label="Airy 08"/> + <we-button data-shape="web_editor/Airy/09" data-select-label="Airy 09"/> + <we-button data-shape="web_editor/Airy/10" data-select-label="Airy 10"/> + <we-button data-shape="web_editor/Airy/11" data-select-label="Airy 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-select-page> </we-select-pager> <we-row string=" ⌙ Flip"><!--   --> <we-button data-flip-x="true" data-no-preview="true" data-dependencies="!shape_none_opt"><i class="fa fa-fw fa-arrows-h"/></we-button> <we-button data-flip-y="true" data-no-preview="true" data-dependencies="!shape_none_opt"><i class="fa fa-fw fa-arrows-v"/></we-button> </we-row> - <we-row string=" ⌙ Colors" data-name="colors"/> + <we-row string=" ⌙ Colors" data-name="colors"> + <we-colorpicker data-select-style="" data-css-property="background-color" data-color-prefix="bg-" data-apply-to=".o_we_shape"/> + </we-row> </we-collapse> </div> </t> |
