@robotical/martyblocksjr 1.0.8 → 1.2.0

package/editions/free/src/assets/blockicons/MartyEyesColour.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="71.066666" viewBox="-20 0 155.8181 93.0762"
+   height="65.400002"><path d="M120.2917,51.3177c3.2338,8.6999,2.7201,18.4841-2.5938,27.2283-8.6366,14.3242-27.3046,18.6105-41.6288,9.9739-14.2671-8.8522-18.5534-27.5202-9.9168-41.8444,8.6366-14.3242,27.3046-18.6105,41.6288-9.9739,3.7539,2.3779,6.9053,5.2885,9.3402,9.1629h0l12.587-6.5882-32.8779-20.4692,3.2657-5.3644,42.4274,26.2269-22.2317,11.6482" fill="#f2f2f1" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width=".5"/><circle cx="92.4989" cy="62.1858" r="7.5827" fill="#1d1d1b"/><path d="M14.0041,23.1813L.4473,2.0592,50.2939,.259l.1267,6.4932-38.6992,1.5214,7.6788,11.9529h0c4.0329-2.1622,8.1546-2.9168,12.6504-3.3416,16.7212-.4183,30.8235,12.5429,31.2418,29.2641s-12.5429,30.8235-29.2641,31.2418c-16.7212,.4183-30.8235-12.5429-31.2418-29.2641-.2916-10.2281,4.1029-18.9849,11.2176-24.9454" fill="#f2f2f1" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width=".5"/><circle cx="33.0439" cy="47.1456" r="7.5827" fill="#1d1d1b"/><polygon points="50.6934 6.5937 4.5244 8.4447 .5043 1.8436 50.5095 .3161 50.6934 6.5937" fill="#1d1d1b"/><polygon points="99.8805 13.3855 142.5805 39.4539 135.8209 43.2014 96.6148 18.75 99.8805 13.3855" fill="#1d1d1b"/><circle cx="38.1552" cy="27.8372" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="27.9327" cy="66.4539" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="13.7356" cy="42.0343" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="52.3522" cy="52.2568" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="13.8789" cy="52.1616" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="19.1575" cy="61.1416" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="18.6246" cy="33.2391" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="28.0141" cy="27.6849" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="52.3428" cy="42.1649" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="47.1547" cy="33.3116" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="38.3673" cy="66.5067" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="47.3509" cy="61.0223" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="97.3908" cy="42.7524" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="87.1683" cy="81.369" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="72.9712" cy="56.9494" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="111.5879" cy="67.172" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="73.1145" cy="67.0767" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="78.3931" cy="76.0567" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="77.8602" cy="48.1542" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="87.2498" cy="42.6001" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="111.5784" cy="57.0801" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="106.3903" cy="48.2267" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="97.6029" cy="81.4218" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/><circle cx="106.5865" cy="75.9374" r="4.4046" fill="#fff" stroke="#0f0f0e" stroke-miterlimit="10" stroke-width=".25"/></svg>

package/editions/free/src/assets/blockicons/MartyLedEyesP1.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?><svg width="71.066666" viewBox="-20 0 155.8181 93.0762"
+   height="65.400002" id="a" xmlns="http://www.w3.org/2000/svg" ><path d="M120.1148,51.2423c3.229,8.6871,2.7161,18.4568-2.59,27.1881-8.6239,14.3031-27.2643,18.583-41.5674,9.9592-14.2461-8.8392-18.5261-27.4796-9.9022-41.7827,8.6239-14.3031,27.2643-18.583,41.5674-9.9592,3.7483,2.3744,6.8951,5.2807,9.3264,9.1493h0l12.5684-6.5784-32.8293-20.439,3.2609-5.3565,42.3647,26.1882-22.1989,11.631" fill="#f2f2f1" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width=".5"/><circle cx="92.363" cy="62.0944" r="7.5715" fill="#1d1d1b"/><path d="M13.9841,23.1475L.4473,2.0566,50.2204,.259l.1266,6.4836-38.6421,1.5191,7.6675,11.9353h0c4.027-2.159,8.1425-2.9125,12.6317-3.3366,16.6966-.4177,30.778,12.5244,31.1957,29.2209,.4177,16.6966-12.5244,30.778-29.2209,31.1957-16.6966,.4177-30.778-12.5244-31.1957-29.2209-.2911-10.213,4.0968-18.9569,11.201-24.9086" fill="#f2f2f1" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width=".5"/><circle cx="32.9958" cy="47.0763" r="7.5715" fill="#1d1d1b"/><polygon points="50.6192 6.5843 4.5184 8.4326 .5042 1.8413 50.4356 .316 50.6192 6.5843" fill="#1d1d1b"/><polygon points="99.7337 13.3661 142.3707 39.3961 135.6211 43.138 96.4728 18.7227 99.7337 13.3661" fill="#1d1d1b"/><circle cx="38.0996" cy="27.7965" r="4.3981" fill="#385ac6"/><circle cx="27.8921" cy="66.3561" r="4.3981" fill="#385ac6"/><circle cx="13.716" cy="41.9726" r="4.3981" fill="#c63838"/><circle cx="52.2756" cy="52.1801" r="4.3981" fill="#c63838"/><circle cx="13.8591" cy="52.085" r="4.3981" fill="#385ac6"/><circle cx="19.1299" cy="61.0517" r="4.3981" fill="#c63838"/><circle cx="18.5977" cy="33.1904" r="4.3981" fill="#385ac6"/><circle cx="27.9734" cy="27.6444" r="4.3981" fill="#c63838"/><circle cx="52.2662" cy="42.1031" r="4.3981" fill="#385ac6"/><circle cx="47.0857" cy="33.2628" r="4.3981" fill="#c63838"/><circle cx="38.3113" cy="66.4089" r="4.3981" fill="#c63838"/><circle cx="47.2816" cy="60.9326" r="4.3981" fill="#385ac6"/><circle cx="97.4098" cy="43.0299" r="4.3981" fill="#385ac6"/><circle cx="87.2023" cy="81.5895" r="4.3981" fill="#385ac6"/><circle cx="73.0262" cy="57.2059" r="4.3981" fill="#c63838"/><circle cx="111.5859" cy="67.4134" r="4.3981" fill="#c63838"/><circle cx="73.1693" cy="67.3183" r="4.3981" fill="#385ac6"/><circle cx="78.4401" cy="76.285" r="4.3981" fill="#c63838"/><circle cx="77.908" cy="48.4237" r="4.3981" fill="#385ac6"/><circle cx="87.2837" cy="42.8778" r="4.3981" fill="#c63838"/><circle cx="111.5764" cy="57.3364" r="4.3981" fill="#385ac6"/><circle cx="106.396" cy="48.4961" r="4.3981" fill="#c63838"/><circle cx="97.6216" cy="81.6422" r="4.3981" fill="#c63838"/><circle cx="106.5919" cy="76.1659" r="4.3981" fill="#385ac6"/></svg>

package/editions/free/src/assets/blockicons/MartyLedEyesP2.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="71.066666" viewBox="-20 0 155.8181 93.0762"
+   height="65.400002"><path d="M119.9505,51.1723c3.2246,8.6751,2.7123,18.4315-2.5864,27.1507-8.612,14.2835-27.2269,18.5575-41.5103,9.9455-14.2265-8.827-18.5006-27.4419-9.8886-41.7253,8.612-14.2835,27.2269-18.5575,41.5103-9.9455,3.7432,2.3712,6.8856,5.2734,9.3136,9.1368h0l12.5511-6.5694-32.7843-20.4109,3.2564-5.3492,42.3066,26.1523-22.1684,11.615" fill="#f2f2f1" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width=".5"/><circle cx="92.2369" cy="62.0095" r="7.5611" fill="#1d1d1b"/><path d="M13.9655,23.1161L.4473,2.0541,50.1521,.259l.1264,6.4747-38.589,1.517,7.657,11.9189h0c4.0214-2.1561,8.1314-2.9085,12.6143-3.332,16.6736-.4171,30.7357,12.5072,31.1529,29.1808,.4171,16.6736-12.5072,30.7357-29.1808,31.1529-16.6736,.4171-30.7357-12.5072-31.1529-29.1808-.2907-10.1989,4.0912-18.9309,11.1856-24.8744" fill="#f2f2f1" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width=".5"/><circle cx="32.9512" cy="47.0121" r="7.5611" fill="#1d1d1b"/><polygon points="50.5503 6.5757 4.5128 8.4214 .5042 1.8391 50.367 .3159 50.5503 6.5757" fill="#1d1d1b"/><polygon points="99.5974 13.3481 142.1759 39.3424 135.4356 43.0791 96.341 18.6973 99.5974 13.3481" fill="#1d1d1b"/><circle cx="38.0479" cy="27.7587" r="4.3921" fill="#39c449"/><circle cx="27.8544" cy="66.2654" r="4.3921" fill="#39c449"/><circle cx="13.6978" cy="41.9154" r="4.3921" fill="#c4c439"/><circle cx="52.2045" cy="52.1088" r="4.3921" fill="#c4c439"/><circle cx="13.8407" cy="52.0139" r="4.3921" fill="#39c449"/><circle cx="19.1043" cy="60.9683" r="4.3921" fill="#c4c439"/><circle cx="18.5728" cy="33.1452" r="4.3921" fill="#39c449"/><circle cx="27.9357" cy="27.6069" r="4.3921" fill="#c4c439"/><circle cx="52.1951" cy="42.0456" r="4.3921" fill="#39c449"/><circle cx="47.0217" cy="33.2175" r="4.3921" fill="#c4c439"/><circle cx="38.2594" cy="66.3181" r="4.3921" fill="#c4c439"/><circle cx="47.2174" cy="60.8493" r="4.3921" fill="#39c449"/><circle cx="97.2767" cy="42.9712" r="4.3921" fill="#c4c439"/><circle cx="87.0833" cy="81.4779" r="4.3921" fill="#c4c439"/><circle cx="72.9266" cy="57.1278" r="4.3921" fill="#39c449"/><circle cx="111.4333" cy="67.3212" r="4.3921" fill="#39c449"/><circle cx="73.0695" cy="67.2263" r="4.3921" fill="#c4c439"/><circle cx="78.3331" cy="76.1807" r="4.3921" fill="#39c449"/><circle cx="77.8017" cy="48.3576" r="4.3921" fill="#c4c439"/><circle cx="87.1645" cy="42.8193" r="4.3921" fill="#39c449"/><circle cx="111.4239" cy="57.2581" r="4.3921" fill="#c4c439"/><circle cx="106.2506" cy="48.4299" r="4.3921" fill="#39c449"/><circle cx="97.4882" cy="81.5305" r="4.3921" fill="#39c449"/><circle cx="106.4462" cy="76.0617" r="4.3921" fill="#c4c439"/></svg>

package/editions/free/src/assets/blockicons/MartyLedEyesP3.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="71.066666" viewBox="-20 0 155.8181 93.0762"
+   height="65.400002"><path d="M119.9292,51.1633c3.224,8.6736,2.7118,18.4282-2.586,27.1459-8.6105,14.2809-27.222,18.5542-41.5029,9.9437-14.224-8.8255-18.4973-27.437-9.8868-41.7179,8.6105-14.2809,27.222-18.5542,41.5029-9.9437,3.7425,2.3707,6.8844,5.2725,9.3119,9.1352h0l12.5489-6.5682-32.7784-20.4073,3.2558-5.3482,42.299,26.1476-22.1645,11.6129" fill="#f2f2f1" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width=".5"/><circle cx="92.2205" cy="61.9985" r="7.5597" fill="#1d1d1b"/><path d="M13.9631,23.112L.4473,2.0538,50.1432,.259l.1264,6.4736-38.5822,1.5168,7.6556,11.9167h0c4.0207-2.1557,8.1299-2.9079,12.6121-3.3314,16.6707-.417,30.7303,12.505,31.1473,29.1756,.417,16.6707-12.505,30.7303-29.1756,31.1473-16.6707,.417-30.7303-12.505-31.1473-29.1756-.2907-10.1971,4.0905-18.9275,11.1836-24.87" fill="#f2f2f1" stroke="#000" stroke-linecap="round" stroke-miterlimit="10" stroke-width=".5"/><circle cx="32.9454" cy="47.0037" r="7.5597" fill="#1d1d1b"/><polygon points="50.5414 6.5745 4.5121 8.4199 .5042 1.8389 50.3581 .3159 50.5414 6.5745" fill="#1d1d1b"/><polygon points="99.5797 13.3458 142.1506 39.3354 135.4115 43.0715 96.3239 18.694 99.5797 13.3458" fill="#1d1d1b"/><circle cx="38.0412" cy="27.7538" r="4.3913" fill="#6f39c4"/><circle cx="27.8495" cy="66.2537" r="4.3913" fill="#6f39c4"/><circle cx="13.6954" cy="41.9079" r="4.3913" fill="#c4c439"/><circle cx="52.1953" cy="52.0996" r="4.3913" fill="#c4c439"/><circle cx="13.8383" cy="52.0046" r="4.3913" fill="#40c439"/><circle cx="19.1009" cy="60.9574" r="4.3913" fill="#385ac6"/><circle cx="18.5696" cy="33.1393" r="4.3913" fill="#ff9700"/><circle cx="27.9308" cy="27.602" r="4.3913" fill="#c63838"/><circle cx="52.1858" cy="42.0382" r="4.3913" fill="#40c439"/><circle cx="47.0134" cy="33.2116" r="4.3913" fill="#385ac6"/><circle cx="38.2526" cy="66.3063" r="4.3913" fill="#c63838"/><circle cx="47.209" cy="60.8385" r="4.3913" fill="#ff9700"/><circle cx="97.0976" cy="42.6239" r="4.3913" fill="#6f39c4"/><circle cx="86.906" cy="81.1237" r="4.3913" fill="#6f39c4"/><circle cx="72.7519" cy="56.7779" r="4.3913" fill="#c4c439"/><circle cx="111.2517" cy="66.9696" r="4.3913" fill="#c4c439"/><circle cx="72.8947" cy="66.8746" r="4.3913" fill="#40c439"/><circle cx="78.1574" cy="75.8275" r="4.3913" fill="#385ac6"/><circle cx="77.6261" cy="48.0093" r="4.3913" fill="#ff9700"/><circle cx="86.9872" cy="42.472" r="4.3913" fill="#c63838"/><circle cx="111.2423" cy="56.9082" r="4.3913" fill="#40c439"/><circle cx="106.0699" cy="48.0817" r="4.3913" fill="#385ac6"/><circle cx="97.3091" cy="81.1763" r="4.3913" fill="#c63838"/><circle cx="106.2655" cy="75.7085" r="4.3913" fill="#ff9700"/></svg>

package/editions/free/src/assets/lobby/privacyOff.svg

@@ -0,0 +1,8 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18.0596 24.1584H45.9407V43.3267C45.9407 51.0258 39.6993 57.2672 32.0001 57.2672C24.301 57.2672 18.0596 51.0258 18.0596 43.3267V24.1584Z" fill="#7CD5FB"/>
+<path d="M24.0913 54.8081C26.3384 56.359 29.0633 57.2672 32.0003 57.2672C39.6996 57.2672 45.9409 51.0258 45.9409 43.3267V24.1584H42.4557V41.5841C42.4557 49.2833 36.2144 55.5247 28.5152 55.5247C26.9689 55.5247 25.4812 55.2729 24.0913 54.8081Z" fill="black" fill-opacity="0.05"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32 6.73273C27.188 6.73273 23.2871 10.6336 23.2871 15.4456V24.1584L26.7721 24.1584V15.4456C26.7721 12.5584 29.1127 10.2179 31.9998 10.2179C34.887 10.2179 37.2275 12.5584 37.2275 15.4456V24.1584L40.7128 24.1584V15.4456C40.7128 10.6336 36.8119 6.73273 32 6.73273Z" fill="#CAD3D0"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.1288 6.77575C31.4154 6.7473 31.7061 6.73273 32.0001 6.73273C36.8121 6.73273 40.713 10.6336 40.713 15.4456V24.1584H38.9703V15.4456C38.9703 10.9277 35.5317 7.21292 31.1288 6.77575ZM31.1288 10.2902C30.8454 10.2426 30.5543 10.2179 30.2575 10.2179C27.3703 10.2179 25.0298 12.5584 25.0298 15.4456V24.1584H26.7723V15.4456C26.7723 12.8553 28.6563 10.7049 31.1288 10.2902Z" fill="#C4C4C4" fill-opacity="0.6"/>
+<circle cx="32.0003" cy="34.6138" r="3.48514" fill="#575E75"/>
+<path d="M30.2577 36.3564H33.7428L35.4854 46.8118H28.5151L30.2577 36.3564Z" fill="#575E75"/>
+</svg>

package/editions/free/src/assets/lobby/privacyOn.svg

@@ -0,0 +1,8 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18.0596 24.1584H45.9407V43.3267C45.9407 51.0259 39.6993 57.2673 32.0001 57.2673C24.301 57.2673 18.0596 51.0259 18.0596 43.3267V24.1584Z" fill="#FF8C1A"/>
+<path d="M24.0913 54.8082C26.3384 56.3591 29.0633 57.2673 32.0003 57.2673C39.6996 57.2673 45.9409 51.0259 45.9409 43.3267V24.1584H42.4557V41.5841C42.4557 49.2833 36.2144 55.5247 28.5152 55.5247C26.9689 55.5247 25.4812 55.2729 24.0913 54.8082Z" fill="black" fill-opacity="0.05"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32 6.73274C27.188 6.73274 23.2871 10.6336 23.2871 15.4456V24.1584L26.7721 24.1584V15.4456C26.7721 12.5584 29.1127 10.2179 31.9998 10.2179C34.887 10.2179 37.2275 12.5584 37.2275 15.4456V24.1584L40.7128 24.1584V15.4456C40.7128 10.6336 36.8119 6.73274 32 6.73274Z" fill="#CAD3D0"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.1288 6.77577C31.4154 6.74731 31.7061 6.73274 32.0001 6.73274C36.8121 6.73274 40.713 10.6336 40.713 15.4456V24.1584H38.9703V15.4456C38.9703 10.9277 35.5317 7.21294 31.1288 6.77577ZM31.1288 10.2902C30.8454 10.2426 30.5543 10.2179 30.2575 10.2179C27.3703 10.2179 25.0298 12.5584 25.0298 15.4456V24.1584H26.7723V15.4456C26.7723 12.8553 28.6563 10.705 31.1288 10.2902Z" fill="#C4C4C4" fill-opacity="0.6"/>
+<circle cx="32.0003" cy="34.6138" r="3.48514" fill="#575E75"/>
+<path d="M30.2577 36.3564H33.7428L35.4854 46.8118H28.5151L30.2577 36.3564Z" fill="#575E75"/>
+</svg>

package/editions/free/src/css/editor.css

@@ -255,7 +255,7 @@ div.frame {
     position: relative;
     margin: ${css_vh(0)} ${css_vh(0)} ${css_vh(0)};
     height: ${64 * scaleMultiplier}px;
-    width: ${800 * scaleMultiplier}px;
+    width: ${900 * scaleMultiplier}px;
     z-index:4;
     overflow: hidden;
 }
@@ -454,6 +454,11 @@ z-index: 5;
     filter: opacity(0.25);
 }
 
+.watermark img{
+    max-width: 100%;
+    max-height: 100%;
+}
+
 .watermark > canvas{
     position: absolute;
 }
@@ -1000,6 +1005,76 @@ Blocks text fields and input fields
     height: ${css_vh(6.25)};
     font-size: ${css_vh(3.13)};
 }
+/* colour keyboard */
+*.colkeyboard {
+    position: absolute;
+    display: none;
+    padding: ${css_vh(0)};
+    margin: ${css_vh(0)};
+    width: ${css_vh(23.44)};
+    top: ${css_vh(71.61)};
+    right: ${css_vh(1)};
+    border: ${scaleMultiplier}px solid #B9C0C6;
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, color-stop(0%,#ffffff), color-stop(1%,#ffffff),  color-stop(100%,#F9F9F9));
+    -webkit-border-radius: ${6 * scaleMultiplier}px;
+    -webkit-box-shadow: ${2 * scaleMultiplier}px ${2 * scaleMultiplier}px ${css_vh(0)} #aaa;
+    z-index: 1000;
+}
+*.colkeyboard.on {display: block;}
+
+.colfield {
+    position: absolute;
+    margin: ${css_vh(0.00)};
+    padding: ${css_vh(0.00)};
+    border: 0px solid;
+    height: ${css_vh(3.13)};
+    width: ${css_vh(5.47)};
+    top: ${css_vh(7.16)};
+    left: ${css_vh(1.30)};
+    color: #77787b;
+    -moz-border-radius: ${12 * scaleMultiplier}px;
+    -webkit-border-radius: ${12 * scaleMultiplier}px;
+    border: ${2 * scaleMultiplier}px solid #c0c2c3;
+    background: #ffffff;
+    pointer-events: all;
+    -webkit-transform: translateZ(0);
+}
+.colfield.on {
+    -webkit-box-shadow: 0px ${scaleMultiplier}px ${scaleMultiplier}px rgba(40, 165, 218, 0.5);
+    border: ${2 * scaleMultiplier}px solid  #9dc7d5;
+    background: #28A5DA;
+    color: #ffffff;
+}
+.colfield-div {
+    border-radius: 50%;
+    height: 80%;
+    width: 50%;
+    margin: 6% 25%;
+}
+
+*.colkeyboard.off {    display: none;}
+
+*.onecol {
+    display: inline-block;
+    position: relative;
+    border-radius: 50%;
+    cursor: pointer;
+    width: ${css_vh(7)};
+    height: ${css_vh(7)};
+    margin: ${css_vh(0.26)};
+    color: #999;
+    line-height: ${css_vh(4.95)};
+    font-size: ${css_vh(2.08)};
+    font-family: Roboto;
+    font-weight: bold;
+    margin: ${css_vh(0.39)};
+    text-shadow: 0 ${css_vh(0.13)} #fff;
+    background-size: 100%;
+    box-sizing: border-box;
+}
+
+*.onecol:active { border: #28A5DA solid 2px; background-size: 100%; }
+
 
 /* numric keyboard */
 

package/editions/free/src/css/editormodal.css

@@ -41,10 +41,6 @@
     margin-right: auto;
 }
 
-.modal.fade {
-    top: -100%;
-}
-
 .modal-body {
     width: 420px;
     height: 113px;

package/editions/free/src/css/lobby.css

@@ -291,6 +291,7 @@ div.languagebuttons {
     margin: auto;
     margin-top: ${css_vh(4)};
     width: 90%;
+    display: inline-block;
 }
 
 div.localizationselect {
@@ -305,8 +306,8 @@ div.localizationselect {
     /* fontsize based on device vertical height doesn't work on 16:9 aspect Android device, just set fixed size font */
     font-size: 34.5px;
     text-align: center;
-    margin-left: ${css_vw(3)};
-    margin-bottom: ${css_vw(2)};
+    /* 1.68 = (87.89 * 0.9 / 3 - 23) / 2 */
+    margin: 0 ${css_vw(1.68)} ${css_vw(2)};
     padding-top: 2%;
     background-image: linear-gradient(0deg, rgba(255,255,255,0) 0%, rgba(255,255,255,0) 50%, rgba(255,255,255,0.2) 51%);
 }
@@ -368,7 +369,7 @@ div.localizationselect.selected:after {
 
 #footer ul.footer-nav .tab,.tab2  {
     position: absolute;
-    width: ${css_vw(25)};
+    width: ${css_vw(20)};
     height: ${css_vh(10.15)};
 }
 
@@ -376,10 +377,11 @@ div.localizationselect.selected:after {
     border-right: 1px solid #ADACA6;
 }
 
-#abouttab       { left: ${css_vw( 0)}; }
-#interfacetab   { left: ${css_vw(25)}; }
-#painttab       { left: ${css_vw(50)}; }
-#blockstab      { left: ${css_vw(75)}; }
+#abouttab       { left: ${css_vw(0)} }
+#interfacetab   { left: ${css_vw(20)} }
+#painttab       { left: ${css_vw(40)} }
+#blockstab      { left: ${css_vw(60)} }
+#privacytab     { left: ${css_vw(80)} }
 
 #footer ul.footer-nav .tab.off, ul.footer-nav .tab2.off   {background-image: none; top:0px;}
 
@@ -398,13 +400,12 @@ div.localizationselect.selected:after {
 
 #footer ul.footer-nav .tab>span , ul.footer-nav .tab2>span{
     position: relative;
-    top: ${css_vh(-6)};
-    left: ${css_vw(5)};
+    top: ${css_vh(-7)};
+    left: ${css_vw(4)};
     padding: 0px;
-    height: ${css_vh(2.86)};
     line-height: ${css_vh(2.86)};
     cursor: pointer;
-    width: ${css_vw(17.58)};
+    width: ${css_vw(11.58)};
     overflow: visible;
     font-size: ${css_vh(2.34)};
     margin: auto;
@@ -416,13 +417,15 @@ div.localizationselect.selected:after {
 
 #footer ul.footer-nav .tab .about-icon {background: url('../assets/lobby/aboutOff.svg'); background-size: 100.5%;}
 #footer ul.footer-nav .tab .interface-icon { background: url('../assets/lobby/interfaceOff.svg'); background-size: 100.5%;}
-#footer ul.footer-nav .tab2 .blocks-icon {background: url('../assets/lobby/blocksOff.svg'); background-size: 100.5%;}
+#footer ul.footer-nav .tab .blocks-icon {background: url('../assets/lobby/blocksOff.svg'); background-size: 100.5%;}
 #footer ul.footer-nav .tab .paint-icon {background: url('../assets/lobby/paintOff.svg'); background-size: 100.5%;}
+#footer ul.footer-nav .tab2 .privacy-icon {background: url('../assets/lobby/privacyOff.svg'); background-size: 100.5%;}
 
 #footer ul.footer-nav .tab.on .about-icon {background: url('../assets/lobby/aboutOn.svg'); background-size: 100.5%;}
 #footer ul.footer-nav .tab.on .interface-icon { background: url('../assets/lobby/interfaceOn.svg'); background-size: 100.5%;}
-#footer ul.footer-nav .tab2.on .blocks-icon {background: url('../assets/lobby/blocksOn.svg'); background-size: 100.5%;}
+#footer ul.footer-nav .tab.on .blocks-icon {background: url('../assets/lobby/blocksOn.svg'); background-size: 100.5%;}
 #footer ul.footer-nav .tab.on .paint-icon {background: url('../assets/lobby/paintOn.svg'); background-size: 100.5%;}
+#footer ul.footer-nav .tab2.on .privacy-icon {background: url('../assets/lobby/privacyOn.svg'); background-size: 100.5%;}
 
 
 *.contentwrap {
@@ -465,6 +468,7 @@ div.localizationselect.selected:after {
     margin: ${css_vh(2.6)} auto;
     width: ${css_vw(87.89)};
     height: auto;
+    text-align: center;
 }
 
 

package/editions/free/src/gettingstarted.html

@@ -18,7 +18,7 @@
 <div class="tutorial" id="tutorialmode">
   <div class="closehelp" id="closeHelp"></div>
   <div class="introvideocontainer">
-      <video class="introvideo" id="myVideo" controls></video>
+      <video class="introvideo" id="myVideo" controls style="display: none;"></video>
   </div>
 </div>
 </body>

package/editions/free/src/home.html

@@ -68,10 +68,14 @@
 				<div class="paint-icon"></div>
                 <span id="painttab-text"></span>
 			</li>
-			<li class="tab2" id="blockstab">
+			<li class="tab" id="blockstab">
 				<div class="blocks-icon"></div>
 				<span id="blockstab-text"></span>
 			</li>
+			<li class="tab2" id="privacytab">
+				<div class="privacy-icon"></div>
+				<span id="privacytab-text"></span>
+			</li>
 			<div></div>
 		</ul>
 	</div>

package/editions/free/src/inapp/blocks.html

@@ -207,6 +207,60 @@
               <div class="block-description" id="BLOCK_WAVE_RIGHT_DESCRIPTION">
               </div>
             </div>
+            <div class="block-wrapper-right">
+
+              <div class="block-title" id="BLOCK_LED_EYES_P1">
+              </div>
+              <div class="block-image-wrapper">
+                <img class="block-image" src="images/marty_led_eyes_P1.png" /> 
+              </div>
+              <div class="block-description" id="BLOCK_LED_EYES_P1_DESCRIPTION">
+              </div>
+
+            </div>
+          </div>
+          <div class="block-wrapper">
+            <div class="block-wrapper-left">
+              <div class="block-title" id="BLOCK_LED_EYES_P2">
+              </div>
+              <div class="block-image-wrapper">
+                <img class="block-image" src="images/marty_led_eyes_P2.png" />
+              </div>
+              <div class="block-description" id="BLOCK_LED_EYES_P2_DESCRIPTION">
+              </div>
+            </div>
+            <div class="block-wrapper-right">
+              <div class="block-title" id="BLOCK_LED_EYES_P3">
+              </div>
+              <div class="block-image-wrapper">
+                <img class="block-image" src="images/marty_led_eyes_P3.png" />
+              </div>
+              <div class="block-description" id="BLOCK_LED_EYES_P3_DESCRIPTION">
+              </div>
+            </div>
+          </div>
+          <div class="block-wrapper">
+            <div class="block-wrapper-left">
+              <div class="block-title" id="BLOCK_LED_EYES_COLOUR">
+              </div>
+              <div class="block-image-wrapper">
+                <img class="block-image" src="images/marty_eyes_colour.png" />
+              </div>
+              <div class="block-description" id="BLOCK_LED_EYES_COLOUR_DESCRIPTION">
+              </div>
+            </div>
+          </div>
+          <div class="block-wrapper">
+            <div class="block-wrapper-left">
+              <div class="block-title" id="BLOCK_CELEBRATE">
+              </div>
+              <div class="block-image-wrapper">
+                <img class="block-image" src="images/celebrate.png" />
+              </div>
+              <div class="block-description" id="BLOCK_CELEBRATE_DESCRIPTION">
+              </div>
+            </div>
+          </div>
           </div>
           <div class="block-category-header" id="green-block-category-header">
           </div>

package/editions/free/src/inapp/privacy.html

@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<script>
+    window.scratchJrPage = 'inappPrivacyPolicy';
+</script>
+<script type="text/javascript" src="../app.bundle.js"></script>
+
+</head>
+<body>
+    <div class="privacy-section-wrapper">
+        <h1 data-i18n="PRIVACY_TITLE"></h1>
+        <div class="description" data-i18n="PRIVACY_LAST_UPDATED"></div>
+    </div>
+
+    <div class="privacy-section-wrapper">
+        <div class="highlight" data-i18n="PRIVACY_HIGHLIGHT"></div>
+        <div class="description" data-i18n="PRIVACY_DESCRIPTION"></div>
+    </div>
+
+    <div class="privacy-section-wrapper">
+        <h2 class="title" data-i18n="PRIVACY_INFORMATION_COLLECTED"></h2>
+        <div class="highlight" data-i18n="PRIVACY_INFORMATION_COLLECTED_HIGHLIGHT"></div>
+        <div class="description" data-i18n="PRIVACY_INFORMATION_COLLECTED_DESCRIPTION"></div>
+
+        <h3 class="title" data-i18n="PRIVACY_INFO_FROM_YOU"></h3>
+        <div class="description" data-i18n="PRIVACY_INFO_FROM_PROJECT"></div>
+        <div class="description" data-i18n="PRIVACY_INFO_FROM_PREFS"></div>
+
+        <h3 class="title" data-i18n="PRIVACY_INFO_FROM_AUTO"></h3>
+        <div class="description" data-i18n="PRIVACY_INFO_FROM_USAGE"></div>
+    </div>
+
+    <div class="privacy-section-wrapper">
+        <h2 class="title" data-i18n="PRIVACY_USAGE"></h2>
+        <div class="highlight" data-i18n="PRIVACY_USAGE_HIGHLIGHT"></div>
+        <div class="description" data-i18n="PRIVACY_USAGE_DESCRIPTION"></div>
+        <div class="description" data-i18n="PRIVACY_USAGE_FOR_SERVICE"></div>
+        <div class="description" data-i18n="PRIVACY_USAGE_FOR_ANALYTICS"></div>
+        <div class="description" data-i18n="PRIVACY_USAGE_FOR_DATA"></div>
+        <div class="description" data-i18n="PRIVACY_USAGE_FOR_LEGAL"></div>
+    </div>
+
+    <div class="privacy-section-wrapper">
+        <h2 class="title" data-i18n="PRIVACY_USAGE_IN_EEA"></h2>
+        <div class="highlight" data-i18n="PRIVACY_USAGE_IN_EEA_HIGHLIGHT"></div>
+        <div class="description" data-i18n="PRIVACY_USAGE_IN_EEA_DESCRIPTION"></div>
+        <div class="description" data-i18n="PRIVACY_USAGE_IN_EEA_CONTRACTUAL_NECESSITY"></div>
+        <div class="description" data-i18n="PRIVACY_USAGE_IN_EEA_LEGITIMATE_INTEREST"></div>
+        <div class="description" data-i18n="PRIVACY_USAGE_IN_EEA_LEGAL_OBLIGATION"></div>
+        <div class="description" data-i18n="PRIVACY_USAGE_IN_EEA_CONSENT"></div>
+    </div>
+
+    <div class="privacy-section-wrapper">
+        <h2 class="title" data-i18n="PRIVACY_SHARING"></h2>
+        <div class="highlight" data-i18n="PRIVACY_SHARING_HIGHLIGHT"></div>
+        <div class="description" data-i18n="PRIVACY_SHARING_DESCRIPTION"></div>
+        <div class="description" data-i18n="PRIVACY_SHARING_WITH_SERVICE_PROVIDER"></div>
+        <div class="description" data-i18n="PRIVACY_SHARING_WITH_EDUCATION"></div>
+        <div class="description" data-i18n="PRIVACY_SHARING_WITH_CHANGE_OF_OWNERSHIP"></div>
+        <div class="description" data-i18n="PRIVACY_SHARING_WITH_SCRATCH_GROUP"></div>
+        <div class="description" data-i18n="PRIVACY_SHARING_WITH_LEGAL"></div>
+        <div class="description" data-i18n="PRIVACY_SHARING_WITH_CONSENT"></div>
+    </div>
+
+    <div class="privacy-section-wrapper">
+        <h2 class="title" data-i18n="PRIVACY_YOUR_RIGHTS"></h2>
+        <div class="highlight" data-i18n="PRIVACY_YOUR_RIGHTS_HIGHLIGHT"></div>
+        <div class="description" data-i18n="PRIVACY_YOUR_RIGHTS_DESCRIPTION"></div>
+        <div class="description" data-i18n="PRIVACY_YOUR_RIGHTS_DELETING"></div>
+        <h3 class="title" data-i18n="PRIVACY_YOUR_RIGHTS_IN_EU"></h3>
+        <div class="highlight" data-i18n="PRIVACY_YOUR_RIGHTS_IN_EU_HIGHLIGHT"></div>
+        <div class="description" data-i18n="PRIVACY_YOUR_RIGHTS_IN_EU_DESCRIPTION"></div>
+    </div>
+
+    <div class="privacy-section-wrapper">
+        <h2 class="title" data-i18n="PRIVACY_DATA_RETENSION"></h2>
+        <div class="highlight" data-i18n="PRIVACY_DATA_RETENSION_HIGHLIGHT"></div>
+        <div class="description" data-i18n="PRIVACY_DATA_RETENSION_DESCRIPTION"></div>
+    </div>
+
+    <div class="privacy-section-wrapper">
+        <h2 class="title" data-i18n="PRIVACY_INFO_PROTECTION"></h2>
+        <div class="highlight" data-i18n="PRIVACY_INFO_PROTECTION_HIGHLIGHT"></div>
+        <div class="description" data-i18n="PRIVACY_INFO_PROTECTION_DESCRIPTION"></div>
+    </div>
+
+    <div class="privacy-section-wrapper">
+        <h2 class="title" data-i18n="PRIVACY_NOTIFICATIONS_OF_CHANGE"></h2>
+        <div class="highlight" data-i18n="PRIVACY_NOTIFICATIONS_OF_CHANGE_HIGHLIGHT"></div>
+        <div class="description" data-i18n="PRIVACY_NOTIFICATIONS_OF_CHANGE_DESCRIPTION"></div>
+    </div>
+
+    <div class="privacy-section-wrapper">
+        <h2 class="title" data-i18n="PRIVACY_INTERNATIONAL_DATA_TRANSFER"></h2>
+        <div class="highlight" data-i18n="PRIVACY_INTERNATIONAL_DATA_TRANSFER_HIGHLIGHT"></div>
+        <div class="description" data-i18n="PRIVACY_INTERNATIONAL_DATA_TRANSFER_DESCRIPTION"></div>
+    </div>
+
+    <div class="privacy-section-wrapper">
+        <h2 class="title" data-i18n="PRIVACY_CONTACT"></h2>
+        <div class="highlight" data-i18n="PRIVACY_CONTACT_HIGHLIGHT"></div>
+        <div class="description" data-i18n="PRIVACY_CONTACT_DESCRIPTION"></div>
+    </div>
+</body>
+</html>

package/editions/free/src/inapp/style/interface.css

@@ -7,8 +7,6 @@ html {
 
 body {
     margin-top: ${css_vh(6)};
-    padding: ${css_vh(2)} ${css_vw(6.05)} ${css_vh(2)};
-    margin: ${css_vh(2.6)} auto;
 }
 
 #content {

package/editions/free/src/inapp/style/privacy.css

@@ -0,0 +1,70 @@
+@import url('../../css/font.css');
+
+/*
+  0.65vh    => 12px
+  0.867vh   => 16px
+  0.975vh   => 18px
+  1.3vh     => 24px
+  1.95vh    => 36px
+  2.6vh     => 48px
+*/
+html {
+  -webkit-user-select: none;
+}
+
+body {
+  color: #595959;
+  font-family: Roboto;
+  padding: ${css_vh(2)} 6.05vw ${css_vh(2)};
+  margin: ${css_vh(2.6)} auto;
+  width: ${css_vw(87.89)};
+  height: auto;
+  margin-bottom: ${css_vh(10.4)};
+}
+
+h1 {
+  font-size: ${css_vh(5.3)};
+  margin-bottom: ${css_vh(0.65)};
+  color: #f5a322;
+}
+
+h2 {
+  font-size: ${css_vh(3.78)};
+  margin-bottom: ${css_vh(1.3)};
+}
+
+h3 {
+  font-size: ${css_vh(2.96)};
+  margin-top: ${css_vh(1.95)}; // 24px
+  margin-bottom: ${css_vh(0.65)}; // 12px
+}
+
+.privacy-section-wrapper {
+  display: block;
+  margin-bottom: ${css_vh(2.6)};
+}
+
+.highlight {
+  display: block;
+  margin-bottom: ${css_vh(0.875)};
+  padding: ${css_vh(2.85)};
+  font-size: ${css_vh(3.8)};
+  line-height: ${css_vh(5.7)};
+  background-color: rgba(76, 151, 255, 0.15);
+}
+
+ul {
+  margin: ${css_vh(2.85)} 0;
+}
+
+.title {
+  font-weight: bold;
+  margin-bottom: ${css_vh(1.3)};
+  color: #2898cd;
+}
+
+.description {
+  font-size: ${css_vh(2.85)};
+  line-height: ${css_vh(4.275)};
+  margin-bottom: ${css_vh(1.3)};
+}

package/editions/free/src/localizations/ca.json

@@ -213,6 +213,40 @@
     "CHARACTER_Whale.svg": "Balena",
     "CHARACTER_Penguin.svg": "Pingüí",
     "CHARACTER_PolarBear.svg": "Ós polar",
+    "CHARACTER_Girl1V2.svg": "Infant",
+    "CHARACTER_Girl2V2.svg": "Infant",
+    "CHARACTER_Girl3V2.svg": "Infant",
+    "CHARACTER_Boy1V2.svg": "Infant",
+    "CHARACTER_Boy2V2.svg": "Infant",
+    "CHARACTER_Boy3V2.svg": "Infant",
+    "CHARACTER_TeenGirl1V2.svg": "Persona",
+    "CHARACTER_TeenGirl2V2.svg": "Persona",
+    "CHARACTER_TeenGirl3V2.svg": "Persona",
+    "CHARACTER_TeenBoy1V2.svg": "Persona",
+    "CHARACTER_TeenBoy2V2.svg": "Persona",
+    "CHARACTER_TeenBoy3V2.svg": "Persona",
+    "CHARACTER_Baby1V2.svg": "Nadó",
+    "CHARACTER_Baby2V2.svg": "Nadó",
+    "CHARACTER_Baby3V2.svg": "Nadó",
+    "CHARACTER_MotherV2.svg": "Persona",
+    "CHARACTER_FatherV2.svg": "Persona",
+    "CHARACTER_GrandmotherV2.svg": "Persona",
+    "CHARACTER_GrandfatherV2.svg": "Persona",
+    "CHARACTER_GirlV2.svg": "Infant",
+    "CHARACTER_BoyV2.svg": "Infant",
+    "CHARACTER_Teen2V2.svg": "Persona",
+    "CHARACTER_Teen3V2.svg": "Persona",
+    "CHARACTER_Farmer1V2.svg": "Granger",
+    "CHARACTER_FarmerV2.svg": "Granger",
+    "CHARACTER_Bike2V2.svg": "Ciclista",
+    "CHARACTER_BikeV2.svg": "Ciclista",
+    "CHARACTER_Car2V2.svg": "Conductor",
+    "CHARACTER_Car1V2.svg": "Conductor",
+    "CHARACTER_AeroplaneV2.svg": "Pilot",
+    "CHARACTER_AstronautV2.svg": "Astronauta",
+    "CHARACTER_InuitV2.svg": "Esquimal",
+    "CHARACTER_ScubadiverV2.svg": "Submarinista",
+    "CHARACTER_RowboatV2.svg": "Remer",
     "CHARACTER_Girl1.svg": "Infant",
     "CHARACTER_Girl2.svg": "Infant",
     "CHARACTER_Girl3.svg": "Infant",

package/editions/free/src/localizations/cy.json

@@ -213,6 +213,40 @@
     "CHARACTER_Whale.svg": "Morfil",
     "CHARACTER_Penguin.svg": "Pengwin",
     "CHARACTER_PolarBear.svg": "Arth Wen",
+    "CHARACTER_Girl1V2.svg": "Plentyn",
+    "CHARACTER_Girl2V2.svg": "Plentyn",
+    "CHARACTER_Girl3V2.svg": "Plentyn",
+    "CHARACTER_Boy1V2.svg": "Plentyn",
+    "CHARACTER_Boy2V2.svg": "Plentyn",
+    "CHARACTER_Boy3V2.svg": "Plentyn",
+    "CHARACTER_TeenGirl1V2.svg": "Person",
+    "CHARACTER_TeenGirl2V2.svg": "Person",
+    "CHARACTER_TeenGirl3V2.svg": "Person",
+    "CHARACTER_TeenBoy1V2.svg": "Person",
+    "CHARACTER_TeenBoy2V2.svg": "Person",
+    "CHARACTER_TeenBoy3V2.svg": "Person",
+    "CHARACTER_Baby1V2.svg": "Babi",
+    "CHARACTER_Baby2V2.svg": "Babi",
+    "CHARACTER_Baby3V2.svg": "Babi",
+    "CHARACTER_MotherV2.svg": "Person",
+    "CHARACTER_FatherV2.svg": "Person",
+    "CHARACTER_GrandmotherV2.svg": "Person",
+    "CHARACTER_GrandfatherV2.svg": "Person",
+    "CHARACTER_GirlV2.svg": "Plentyn",
+    "CHARACTER_BoyV2.svg": "Plentyn",
+    "CHARACTER_Teen2V2.svg": "Person",
+    "CHARACTER_Teen3V2.svg": "Person",
+    "CHARACTER_Farmer1V2.svg": "Ffarmwr",
+    "CHARACTER_FarmerV2.svg": "Ffarmwr",
+    "CHARACTER_Bike2V2.svg": "Beiciwr",
+    "CHARACTER_BikeV2.svg": "Beiciwr",
+    "CHARACTER_Car2V2.svg": "Gyrrwr",
+    "CHARACTER_Car1V2.svg": "Gyrrwr",
+    "CHARACTER_AeroplaneV2.svg": "Peilot",
+    "CHARACTER_AstronautV2.svg": "Gofodwr",
+    "CHARACTER_InuitV2.svg": "Gogleddwr",
+    "CHARACTER_ScubadiverV2.svg": "Deifiwr Sgwba",
+    "CHARACTER_RowboatV2.svg": "Rhwyfwr",
     "CHARACTER_Girl1.svg": "Plentyn",
     "CHARACTER_Girl2.svg": "Plentyn",
     "CHARACTER_Girl3.svg": "Plentyn",