diff --git a/public/lit/texts.tsx b/public/lit/texts.tsx
index a391da656962c546c2b30dede8749e2875c2900e..d12d6a8c2d71d1a460ff355c509184d156ae4920 100644
--- a/public/lit/texts.tsx
+++ b/public/lit/texts.tsx
@@ -131,6 +131,17 @@ export const toTest =
EN: "Let's test",
SK: "K testu"
}
+export const skipToChapter =
+ {
+ EN: "Skip to Chapter ",
+ SK: "PreskoÄŤ na kapitolu "
+ }
+
+export const skipToTest =
+ {
+ EN: "Skip to Test",
+ SK: "PreskoÄŤ na test"
+ }
export const correct =
{
EN: "Correct!",
diff --git a/src/assets/backgrounds/homepage-static.svg b/src/assets/backgrounds/homepage-static.svg
index f8f35b26107c31d4f431562098235f77431c28b1..58d606f5cb51cd01df4d78e9f7d99a8196247686 100644
--- a/src/assets/backgrounds/homepage-static.svg
+++ b/src/assets/backgrounds/homepage-static.svg
@@ -2,9 +2,9 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
- width="1174.3289mm"
- height="578.71973mm"
- viewBox="0 0 1174.3289 578.71973"
+ width="1312.6133mm"
+ height="680.16168mm"
+ viewBox="0 0 1312.6133 680.16168"
version="1.1"
id="svg5"
inkscape:export-filename="girly.svg"
@@ -43,534 +43,526 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(-1400.9307,-268.26315)">
+ transform="translate(-1322.178,-159.93997)">
+ <path
+ style="fill:#5599ff;fill-opacity:1;stroke:none;stroke-width:18.0948"
+ d="m 2446.5641,840.2766 -931.1324,-0.0194 c -14.9322,-40.18867 -17.9645,-78.24115 -9.9973,-114.31913 13.4677,-52.9874 38.5328,-97.73162 82.7753,-130.1833 36.5365,-27.59266 78.6504,-44.05666 127.8383,-46.40512 35.3242,-47.04318 90.8275,-88.80026 237.1603,-106.76363 66.5435,-0.3801 134.1244,6.50594 210.1692,72.6738 43.4496,34.48863 63.4961,65.92399 74.5761,98.66019 55.4612,-14.87587 101.0385,-4.70884 141.4688,18.49879 35.8124,21.92748 65.6397,53.68677 80.4518,110.11182 3.7336,31.85818 2.7163,64.13725 -13.3101,97.74597 z"
+ id="path87972"
+ sodipodi:nodetypes="ccccccccccc" />
<ellipse
- style="fill:#5599ff;stroke:none;stroke-width:1.17298"
+ style="fill:#5599ff;stroke:none;stroke-width:0.989016"
id="path1686"
- cx="2379.4709"
- cy="415.11011"
- rx="77.934769"
- ry="77.61187"
+ cx="2313.4385"
+ cy="484.38074"
+ rx="66.56636"
+ ry="64.599571"
inkscape:export-filename="insu-learn\src\assets\backgrounds\homepage-static.svg"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96" />
- <path
- id="path1686-0"
- style="fill:#5599ff;stroke:none;stroke-width:3.98348"
- d="m 1962.0421,364.88258 c -111.3665,0.0868 -216.0776,47.52524 -282.1707,127.83482 -138.9274,8.01249 -248.131,119.86284 -250.627,256.70168 -0.4851,31.77368 4.9134,63.3706 15.9314,93.24665 493.2385,2.10326 802.3063,1.22331 1090.1752,0 11.8945,-25.58593 18.0447,-53.3168 18.0455,-81.3661 -10e-5,-109.66601 -91.9958,-198.56774 -205.478,-198.56754 -19.1531,0.0367 -38.2069,2.66113 -56.6081,7.79704 -50.8629,-123.56441 -182.2776,-205.64028 -329.2683,-205.64655 z"
- sodipodi:nodetypes="ccccccccc" />
<rect
- style="fill:#0044aa;stroke:none;stroke-width:5.24119"
+ style="fill:#0044aa;stroke:none;stroke-width:4.41919"
id="rect1898"
- width="226.75513"
- height="260.65442"
- x="1985.1387"
- y="581.28088"
- ry="36.023651" />
+ width="193.67818"
+ height="216.95345"
+ x="1976.6277"
+ y="622.69153"
+ ry="29.983974" />
<rect
- style="fill:#d5e5ff;stroke:none;stroke-width:4.40343"
+ style="fill:#d5e5ff;stroke:none;stroke-width:3.71282"
id="rect2155"
- width="238.97214"
- height="61.330456"
- x="1979.0548"
- y="553.80823"
- ry="10.143684" />
+ width="204.11308"
+ height="51.047874"
+ x="1971.4314"
+ y="599.82489"
+ ry="8.4430075" />
<rect
- style="fill:#d5e5ff;stroke:none;stroke-width:4.68787"
+ style="fill:#d5e5ff;stroke:none;stroke-width:3.95265"
id="rect2211"
- width="183.92361"
- height="124.43007"
- x="2008.4442"
- y="636.12433"
- ry="10.143684" />
+ width="157.09453"
+ height="103.56829"
+ x="1996.5337"
+ y="668.34003"
+ ry="8.4430075" />
<rect
- style="fill:#550022;stroke:none;stroke-width:4.68787"
+ style="fill:#550022;stroke:none;stroke-width:3.95265"
id="rect2213"
- width="151.79997"
- height="12.384035"
- x="2022.3016"
- y="649.09814"
+ width="129.6568"
+ height="10.307744"
+ x="2008.3698"
+ y="679.13867"
ry="0" />
<rect
- style="fill:#550022;stroke:none;stroke-width:4.68787"
+ style="fill:#550022;stroke:none;stroke-width:3.95265"
id="rect2267"
- width="107.33878"
- height="12.926756"
- x="2022.3291"
- y="667.34302" />
+ width="91.68119"
+ height="10.759473"
+ x="2008.3932"
+ y="694.32458" />
<rect
- style="fill:#ac93a7;stroke:none;stroke-width:4.68787"
+ style="fill:#ac93a7;stroke:none;stroke-width:3.95265"
id="rect2269"
- width="126.9359"
- height="12.71826"
- x="2022.3842"
- y="694.03052" />
+ width="108.41966"
+ height="10.585934"
+ x="2008.4403"
+ y="716.53772" />
<rect
- style="fill:#ac93a7;stroke:none;stroke-width:4.57114"
+ style="fill:#ac93a7;stroke:none;stroke-width:3.85422"
id="rect2323"
- width="64.581429"
- height="12.092772"
- x="2022.4399"
- y="713.88965" />
+ width="55.160885"
+ height="10.065313"
+ x="2008.4878"
+ y="733.06732" />
<rect
- style="fill:#b7bec8;stroke:none;stroke-width:4.19485"
+ style="fill:#b7bec8;stroke:none;stroke-width:3.53695"
id="rect2334"
- width="240.12834"
- height="337.10056"
- x="1714.2258"
- y="317.48404"
- ry="18.918285" />
+ width="205.10063"
+ height="280.58273"
+ x="1745.2333"
+ y="403.1225"
+ ry="15.746471" />
<rect
- style="fill:#ff0000;stroke:none;stroke-width:1.7401"
+ style="fill:#ff0000;stroke:none;stroke-width:1.46719"
id="rect2754"
- width="75.981194"
- height="23.278763"
- x="1742.8781"
- y="338.09561"
- ry="11.639381" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:1.63782"
- d="m 1781.8274,337.99726 0.03,23.49154"
+ width="64.897758"
+ height="19.375877"
+ x="1769.7059"
+ y="420.27835"
+ ry="9.6879387" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:1.38095"
+ d="m 1802.9737,420.19651 0.026,19.55303"
id="path3006" />
<path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.294525"
- d="m 1782.6986,354.933 c 0,-3.5286 -0.017,-8.74968 -0.037,-11.60241 l -0.037,-5.18681 h 12.8407 c 8.6093,0 12.9971,0.02 13.3151,0.0599 2.9541,0.37294 5.6386,1.87202 7.4809,4.17746 3.3275,4.16427 3.4228,10.11859 0.2306,14.40822 -1.5708,2.11085 -3.9931,3.69591 -6.5274,4.27139 -1.2934,0.29367 -1.0001,0.2879 -14.6029,0.2879 h -12.6626 z"
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.248333"
+ d="m 1803.7178,434.29287 c 0,-2.937 -0.014,-7.28273 -0.032,-9.65715 l -0.032,-4.31719 h 10.9676 c 7.3535,0 11.1012,0.0166 11.3729,0.0499 2.5231,0.31038 4.8161,1.55814 6.3896,3.47702 2.8421,3.46612 2.9235,8.42213 0.197,11.99254 -1.3417,1.75699 -3.4106,3.07625 -5.5753,3.55526 -1.1047,0.24446 -0.8542,0.23964 -12.4727,0.23964 h -10.8155 z"
id="path3131" />
<rect
- style="fill:#ff0000;stroke:none;stroke-width:1.7401"
+ style="fill:#ff0000;stroke:none;stroke-width:1.46719"
id="rect2754-5"
- width="75.981194"
- height="23.278763"
- x="1742.9366"
- y="375.79324"
- ry="11.639381" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:1.63782"
- d="m 1781.886,375.69486 0.03,23.49154"
+ width="64.897758"
+ height="19.375877"
+ x="1769.756"
+ y="451.65567"
+ ry="9.6879387" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:1.38095"
+ d="m 1803.0238,451.57378 0.026,19.55303"
id="path3006-4" />
<path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.294525"
- d="m 1782.7572,392.63059 c 0,-3.52859 -0.017,-8.74967 -0.037,-11.6024 l -0.037,-5.18681 h 12.8407 c 8.6093,0 12.9971,0.02 13.315,0.0598 2.9541,0.37292 5.6387,1.87202 7.481,4.17745 3.3275,4.16428 3.4228,10.1186 0.2305,14.40822 -1.5708,2.11086 -3.9931,3.69592 -6.5273,4.2714 -1.2934,0.29367 -1.0002,0.2879 -14.603,0.2879 h -12.6625 z"
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.248333"
+ d="m 1803.7679,465.67014 c 0,-2.937 -0.014,-7.28273 -0.032,-9.65715 l -0.032,-4.31719 h 10.9676 c 7.3534,0 11.1012,0.0166 11.3727,0.0499 2.5232,0.31038 4.8162,1.55814 6.3898,3.47702 2.8421,3.46612 2.9235,8.42213 0.1968,11.99254 -1.3416,1.75699 -3.4106,3.07625 -5.5751,3.55527 -1.1047,0.24445 -0.8543,0.23963 -12.4729,0.23963 h -10.8154 z"
id="path3131-3" />
<rect
- style="fill:#ff0000;stroke:none;stroke-width:1.7401"
+ style="fill:#ff0000;stroke:none;stroke-width:1.46719"
id="rect2754-3"
- width="75.981194"
- height="23.278763"
- x="1847.6807"
- y="337.99347"
- ry="11.639381" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:1.63782"
- d="m 1886.63,337.89513 0.03,23.49154"
+ width="64.897758"
+ height="19.375877"
+ x="1859.2208"
+ y="420.19342"
+ ry="9.6879387" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:1.38095"
+ d="m 1892.4887,420.11153 0.026,19.55294"
id="path3006-0" />
<path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.294525"
- d="m 1887.5013,354.83087 c 0,-3.5286 -0.017,-8.74968 -0.037,-11.60242 l -0.037,-5.1868 h 12.8408 c 8.6092,0 12.997,0.02 13.315,0.0599 2.9541,0.37293 5.6387,1.87202 7.4809,4.17746 3.3274,4.16427 3.4228,10.11859 0.2305,14.40822 -1.5708,2.11086 -3.993,3.69592 -6.5274,4.27139 -1.2933,0.29367 -1.0001,0.2879 -14.6029,0.2879 h -12.6617 z"
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.248333"
+ d="m 1893.2329,434.20781 c 0,-2.937 -0.014,-7.28266 -0.032,-9.65716 l -0.032,-4.31719 h 10.9677 c 7.3533,0 11.1011,0.0167 11.3727,0.0499 2.5232,0.31047 4.8162,1.55815 6.3897,3.47711 2.842,3.46612 2.9235,8.42213 0.1968,11.99254 -1.3416,1.75699 -3.4105,3.07625 -5.5752,3.55526 -1.1046,0.24446 -0.8542,0.23963 -12.4728,0.23963 h -10.8147 z"
id="path3131-8" />
<rect
- style="fill:#ff0000;stroke:none;stroke-width:1.7401"
+ style="fill:#ff0000;stroke:none;stroke-width:1.46719"
id="rect2754-50"
- width="75.981194"
- height="23.278763"
- x="1847.8208"
- y="375.67651"
- ry="11.639381" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:1.63782"
- d="m 1886.7701,375.57817 0.03,23.49155"
+ width="64.897758"
+ height="19.375877"
+ x="1859.3405"
+ y="451.55853"
+ ry="9.6879387" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:1.38095"
+ d="m 1892.6083,451.47664 0.026,19.55303"
id="path3006-6" />
<path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.294525"
- d="m 1887.6414,392.51391 c 0,-3.5286 -0.017,-8.74968 -0.037,-11.60242 l -0.037,-5.1868 h 12.8408 c 8.6092,0 12.997,0.02 13.315,0.0598 2.9541,0.37293 5.6387,1.87202 7.4809,4.17745 3.3275,4.16428 3.4228,10.11859 0.2305,14.40823 -1.5708,2.11086 -3.993,3.69591 -6.5273,4.27139 -1.2934,0.29367 -1.0001,0.2879 -14.603,0.2879 h -12.6624 z"
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.248333"
+ d="m 1893.3525,465.57301 c 0,-2.937 -0.014,-7.28274 -0.032,-9.65716 l -0.032,-4.31718 h 10.9677 c 7.3534,0 11.1012,0.0166 11.3728,0.0499 2.5232,0.31038 4.8161,1.55814 6.3896,3.47702 2.8421,3.46612 2.9235,8.42213 0.1969,11.99254 -1.3417,1.75699 -3.4105,3.07633 -5.5752,3.55526 -1.1047,0.24446 -0.8542,0.23963 -12.4728,0.23963 h -10.8153 z"
id="path3131-9" />
<rect
- style="fill:#ff0000;stroke:none;stroke-width:1.7401"
+ style="fill:#ff0000;stroke:none;stroke-width:1.46719"
id="rect2754-0"
- width="75.981194"
- height="23.278763"
- x="1847.941"
- y="413.74136"
- ry="11.639381" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:1.63782"
- d="m 1886.8904,413.64299 0.03,23.49154"
+ width="64.897758"
+ height="19.375877"
+ x="1859.4432"
+ y="483.24146"
+ ry="9.6879387" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:1.38095"
+ d="m 1892.7111,483.15963 0.026,19.55295"
id="path3006-02" />
<path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.294525"
- d="m 1887.7617,430.57873 c 0,-3.5286 -0.017,-8.74968 -0.037,-11.60241 l -0.037,-5.18681 h 12.8407 c 8.6092,0 12.997,0.02 13.315,0.0598 2.9541,0.37293 5.6387,1.87202 7.4809,4.17746 3.3275,4.16426 3.4229,10.11859 0.2306,14.40822 -1.5709,2.11085 -3.9931,3.69591 -6.5274,4.27139 -1.2933,0.29367 -1.0002,0.2879 -14.6029,0.2879 h -12.6625 z"
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.248333"
+ d="m 1893.4553,497.25592 c 0,-2.937 -0.014,-7.28274 -0.032,-9.65716 l -0.032,-4.31719 h 10.9676 c 7.3534,0 11.1011,0.0167 11.3727,0.0499 2.5232,0.31038 4.8162,1.55815 6.3897,3.47702 2.8421,3.46612 2.9236,8.42213 0.197,11.99263 -1.3418,1.7569 -3.4107,3.07625 -5.5753,3.55526 -1.1046,0.24438 -0.8543,0.23963 -12.4728,0.23963 h -10.8154 z"
id="path3131-1" />
<rect
- style="fill:#ff0000;stroke:none;stroke-width:1.7401"
+ style="fill:#ff0000;stroke:none;stroke-width:1.46719"
id="rect2754-6"
- width="75.981194"
- height="23.278763"
- x="1848.1488"
- y="451.94708"
- ry="11.639381" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:1.63782"
- d="m 1887.0981,451.84871 0.03,23.49154"
+ width="64.897758"
+ height="19.375877"
+ x="1859.6207"
+ y="515.04175"
+ ry="9.6879387" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:1.38095"
+ d="m 1892.8885,514.95982 0.026,19.55294"
id="path3006-7" />
<path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.294525"
- d="m 1887.9693,468.78445 c 0,-3.5286 -0.017,-8.74968 -0.037,-11.60242 l -0.037,-5.1868 h 12.8408 c 8.6093,0 12.997,0.02 13.315,0.0598 2.9541,0.37293 5.6387,1.87203 7.4809,4.17745 3.3275,4.16428 3.4229,10.1186 0.2305,14.40822 -1.5707,2.11086 -3.993,3.69592 -6.5273,4.2714 -1.2934,0.29367 -1.0001,0.2879 -14.603,0.2879 h -12.6624 z"
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.248333"
+ d="m 1893.6326,529.0561 c 0,-2.937 -0.014,-7.28274 -0.032,-9.65716 l -0.032,-4.31718 h 10.9677 c 7.3535,0 11.1011,0.0166 11.3727,0.0499 2.5232,0.31038 4.8162,1.55814 6.3897,3.4771 2.8421,3.46604 2.9236,8.42205 0.1969,11.99254 -1.3416,1.75691 -3.4106,3.07625 -5.5752,3.55526 -1.1047,0.24438 -0.8542,0.23964 -12.4728,0.23964 h -10.8154 z"
id="path3131-2" />
<rect
- style="fill:#ff0000;stroke:none;stroke-width:1.7401"
+ style="fill:#ff0000;stroke:none;stroke-width:1.46719"
id="rect2754-34"
- width="75.981194"
- height="23.278763"
- x="1848.1541"
- y="489.55728"
- ry="11.639381" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:1.63782"
- d="m 1887.1034,489.4589 0.03,23.49154"
+ width="64.897758"
+ height="19.375877"
+ x="1859.6251"
+ y="546.34625"
+ ry="9.6879387" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:1.38095"
+ d="m 1892.893,546.26434 0.026,19.55295"
id="path3006-2" />
<path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.294525"
- d="m 1887.9747,506.39464 c 0,-3.5286 -0.017,-8.74968 -0.037,-11.60242 l -0.037,-5.1868 h 12.8407 c 8.6092,0 12.997,0.02 13.315,0.0599 2.9541,0.37294 5.6387,1.87202 7.4809,4.17746 3.3275,4.16427 3.4228,10.11859 0.2306,14.40822 -1.5708,2.11085 -3.9931,3.69591 -6.5274,4.27139 -1.2933,0.29367 -1.0002,0.2879 -14.6029,0.2879 h -12.6626 z"
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.248333"
+ d="m 1893.6372,560.36062 c 0,-2.937 -0.014,-7.28273 -0.032,-9.65715 l -0.032,-4.31719 h 10.9676 c 7.3534,0 11.1012,0.0166 11.3728,0.0499 2.5231,0.31038 4.8161,1.55814 6.3896,3.47702 2.8421,3.46612 2.9235,8.42213 0.197,11.99263 -1.3417,1.7569 -3.4106,3.07625 -5.5753,3.55518 -1.1046,0.24445 -0.8543,0.23963 -12.4727,0.23963 h -10.8155 z"
id="path3131-33" />
<rect
- style="fill:#ff0000;stroke:none;stroke-width:1.7401"
+ style="fill:#ff0000;stroke:none;stroke-width:1.46719"
id="rect2754-8"
- width="75.981194"
- height="23.278763"
- x="1848.0554"
- y="527.33331"
- ry="11.639381" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:1.63782"
- d="m 1887.0048,527.23497 0.03,23.49153"
+ width="64.897758"
+ height="19.375877"
+ x="1859.5409"
+ y="577.78882"
+ ry="9.6879387" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:1.38095"
+ d="m 1892.8088,577.70687 0.026,19.55303"
id="path3006-46" />
<path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.294525"
- d="m 1887.8761,544.1707 c 0,-3.5286 -0.017,-8.74968 -0.037,-11.60242 l -0.037,-5.18681 h 12.8408 c 8.6092,0 12.9969,0.02 13.315,0.0599 2.9541,0.37293 5.6387,1.87202 7.4808,4.17745 3.3275,4.16428 3.4228,10.11859 0.2306,14.40822 -1.5708,2.11086 -3.993,3.69592 -6.5274,4.27139 -1.2933,0.29368 -1.0001,0.28791 -14.6029,0.28791 h -12.6625 z"
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.248333"
+ d="m 1893.553,591.80323 c 0,-2.937 -0.014,-7.28273 -0.032,-9.65724 l -0.032,-4.31718 h 10.9677 c 7.3534,0 11.101,0.0166 11.3727,0.0499 2.5232,0.31046 4.8162,1.55814 6.3896,3.4771 2.8421,3.46612 2.9235,8.42213 0.197,11.99254 -1.3417,1.75699 -3.4106,3.07625 -5.5753,3.55527 -1.1046,0.24445 -0.8542,0.23963 -12.4727,0.23963 h -10.8155 z"
id="path3131-31" />
<rect
- style="fill:#ff0000;stroke:none;stroke-width:1.7401"
+ style="fill:#ff0000;stroke:none;stroke-width:1.46719"
id="rect2754-7"
- width="75.981194"
- height="23.278763"
- x="1848.1024"
- y="608.62769"
- ry="11.639381" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:1.63782"
- d="m 1887.0518,608.52931 0.03,23.49154"
+ width="64.897758"
+ height="19.375877"
+ x="1859.5812"
+ y="645.45343"
+ ry="9.6879387" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:1.38095"
+ d="m 1892.8489,645.37156 0.026,19.55294"
id="path3006-44" />
<path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.294525"
- d="m 1887.923,625.46505 c 0,-3.52861 -0.017,-8.74968 -0.037,-11.60242 l -0.037,-5.1868 h 12.8407 c 8.6093,0 12.9971,0.02 13.3151,0.0598 2.9541,0.37294 5.6386,1.87202 7.4809,4.17746 3.3275,4.16427 3.4228,10.11859 0.2305,14.40822 -1.5707,2.11085 -3.9931,3.69591 -6.5273,4.27139 -1.2934,0.29367 -1.0001,0.2879 -14.603,0.2879 h -12.6625 z"
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.248333"
+ d="m 1893.5931,659.46784 c 0,-2.937 -0.015,-7.28274 -0.032,-9.65716 l -0.032,-4.31718 h 10.9676 c 7.3534,0 11.1012,0.0166 11.3728,0.0499 2.5232,0.31038 4.8161,1.55814 6.3896,3.47702 2.8422,3.46612 2.9236,8.42213 0.1969,11.99262 -1.3416,1.75691 -3.4106,3.07625 -5.5751,3.55526 -1.1048,0.24438 -0.8542,0.23964 -12.4729,0.23964 h -10.8154 z"
id="path3131-6" />
<rect
- style="fill:#ff0000;stroke:none;stroke-width:1.7401"
+ style="fill:#ff0000;stroke:none;stroke-width:1.46719"
id="rect2754-86"
- width="75.981194"
- height="23.278763"
- x="1848.0886"
- y="566.54712"
- ry="11.639381" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:1.63782"
- d="m 1887.038,566.44879 0.03,23.49154"
+ width="64.897758"
+ height="19.375877"
+ x="1859.5692"
+ y="610.42804"
+ ry="9.6879387" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:1.38095"
+ d="m 1892.8372,610.34613 0.026,19.55303"
id="path3006-21" />
<path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.294525"
- d="m 1887.9092,583.38452 c 0,-3.5286 -0.017,-8.74967 -0.037,-11.60241 l -0.037,-5.1868 h 12.8408 c 8.6092,0 12.9969,0.02 13.315,0.0598 2.9541,0.37293 5.6387,1.87202 7.4809,4.17745 3.3275,4.16428 3.4228,10.1186 0.2305,14.40822 -1.5707,2.11086 -3.993,3.69592 -6.5273,4.2714 -1.2934,0.29367 -1.0001,0.2879 -14.603,0.2879 h -12.6624 z"
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.248333"
+ d="m 1893.5813,624.4425 c 0,-2.937 -0.014,-7.28274 -0.032,-9.65716 l -0.032,-4.31718 h 10.9677 c 7.3533,0 11.101,0.0166 11.3727,0.0499 2.5232,0.31038 4.8162,1.55814 6.3897,3.47702 2.8421,3.46612 2.9235,8.42213 0.1968,11.99254 -1.3415,1.75699 -3.4105,3.07633 -5.5751,3.55526 -1.1048,0.24446 -0.8542,0.23963 -12.4729,0.23963 h -10.8145 z"
id="path3131-5" />
<rect
- style="fill:#ff0000;stroke:none;stroke-width:1.7401"
+ style="fill:#ff0000;stroke:none;stroke-width:1.46719"
id="rect2754-06"
- width="75.981194"
- height="23.278763"
- x="1742.9475"
- y="413.75488"
- ry="11.639381" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:1.63782"
- d="m 1781.8969,413.65651 0.03,23.49154"
+ width="64.897758"
+ height="19.375877"
+ x="1769.7653"
+ y="483.25272"
+ ry="9.6879387" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:1.38095"
+ d="m 1803.0331,483.17087 0.026,19.55295"
id="path3006-20" />
<path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.294525"
- d="m 1782.7681,430.59224 c 0,-3.5286 -0.017,-8.74968 -0.037,-11.60242 l -0.037,-5.1868 h 12.8407 c 8.6093,0 12.9971,0.02 13.315,0.0599 2.9541,0.37293 5.6387,1.87202 7.4809,4.17745 3.3276,4.16428 3.4229,10.11859 0.2306,14.40822 -1.5708,2.11086 -3.9931,3.69592 -6.5273,4.27139 -1.2935,0.29368 -1.0002,0.28791 -14.603,0.28791 h -12.6625 z"
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.248333"
+ d="m 1803.7772,497.26715 c 0,-2.937 -0.014,-7.28273 -0.032,-9.65715 l -0.032,-4.31719 h 10.9676 c 7.3535,0 11.1012,0.0167 11.3727,0.0499 2.5232,0.31038 4.8162,1.55814 6.3897,3.47702 2.8422,3.46612 2.9236,8.42213 0.197,11.99263 -1.3417,1.7569 -3.4107,3.07625 -5.5752,3.55526 -1.1048,0.24437 -0.8543,0.23963 -12.4729,0.23963 h -10.8154 z"
id="path3131-0" />
<rect
- style="fill:#ff0000;stroke:none;stroke-width:1.7401"
+ style="fill:#ff0000;stroke:none;stroke-width:1.46719"
id="rect2754-58"
- width="75.981194"
- height="23.278763"
- x="1742.9219"
- y="489.72427"
- ry="11.639381" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:1.63782"
- d="m 1781.8713,489.62593 0.03,23.49154"
+ width="64.897758"
+ height="19.375877"
+ x="1769.7434"
+ y="546.48529"
+ ry="9.6879387" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:1.38095"
+ d="m 1803.0112,546.40334 0.026,19.55295"
id="path3006-29" />
<path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.294525"
- d="m 1782.7425,506.56166 c 0,-3.5286 -0.017,-8.74968 -0.037,-11.60241 l -0.037,-5.18681 h 12.8407 c 8.6092,0 12.997,0.02 13.315,0.0599 2.9541,0.37293 5.6387,1.87202 7.481,4.17745 3.3274,4.16428 3.4228,10.11859 0.2305,14.40822 -1.5708,2.11086 -3.9931,3.69592 -6.5274,4.27139 -1.2933,0.29368 -1.0001,0.28791 -14.6029,0.28791 h -12.6625 z"
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.248333"
+ d="m 1803.7553,560.49963 c 0,-2.937 -0.014,-7.28274 -0.032,-9.65716 l -0.032,-4.31719 h 10.9676 c 7.3534,0 11.1012,0.0167 11.3728,0.0499 2.5232,0.31038 4.8161,1.55814 6.3897,3.47702 2.842,3.46612 2.9235,8.42213 0.1969,11.99263 -1.3417,1.7569 -3.4106,3.07625 -5.5753,3.55526 -1.1046,0.24438 -0.8542,0.23963 -12.4727,0.23963 h -10.8154 z"
id="path3131-11" />
<rect
- style="fill:#ff0000;stroke:none;stroke-width:1.7401"
+ style="fill:#ff0000;stroke:none;stroke-width:1.46719"
id="rect2754-64"
- width="75.981194"
- height="23.278763"
- x="1743.016"
- y="527.3562"
- ry="11.639381" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:1.63782"
- d="m 1781.9654,527.25784 0.03,23.49154"
+ width="64.897758"
+ height="19.375877"
+ x="1769.8237"
+ y="577.8078"
+ ry="9.6879387" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:1.38095"
+ d="m 1803.0916,577.72593 0.026,19.55294"
id="path3006-65" />
<path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.294525"
- d="m 1782.8367,544.19358 c 0,-3.5286 -0.017,-8.74968 -0.037,-11.60241 l -0.037,-5.18681 h 12.8408 c 8.6091,0 12.9969,0.02 13.315,0.0599 2.9541,0.37294 5.6387,1.87202 7.4809,4.17746 3.3274,4.16427 3.4228,10.11859 0.2305,14.40822 -1.5708,2.11085 -3.993,3.69591 -6.5274,4.27139 -1.2933,0.29367 -1.0001,0.2879 -14.6029,0.2879 h -12.6625 z"
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.248333"
+ d="m 1803.8358,591.82221 c 0,-2.937 -0.014,-7.28265 -0.032,-9.65716 l -0.032,-4.31718 h 10.9677 c 7.3533,0 11.101,0.0166 11.3727,0.0499 2.5232,0.31046 4.8162,1.55814 6.3897,3.4771 2.842,3.46604 2.9235,8.42213 0.1968,11.99254 -1.3416,1.75691 -3.4105,3.07625 -5.5752,3.55527 -1.1046,0.24445 -0.8542,0.23963 -12.4728,0.23963 h -10.8154 z"
id="path3131-4" />
<rect
- style="fill:#ff0000;stroke:none;stroke-width:1.7401"
+ style="fill:#ff0000;stroke:none;stroke-width:1.46719"
id="rect2754-1"
- width="75.981194"
- height="23.278763"
- x="1742.9529"
- y="608.63245"
- ry="11.639381" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:1.63782"
- d="m 1781.9023,608.53404 0.03,23.49154"
+ width="64.897758"
+ height="19.375877"
+ x="1769.7699"
+ y="645.4574"
+ ry="9.6879387" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:1.38095"
+ d="m 1803.0377,645.37547 0.026,19.55295"
id="path3006-468" />
<path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.294525"
- d="m 1782.7736,625.46978 c 0,-3.52861 -0.017,-8.74968 -0.037,-11.60242 l -0.037,-5.1868 h 12.8407 c 8.6092,0 12.997,0.02 13.3151,0.0598 2.9541,0.37294 5.6386,1.87202 7.4808,4.17746 3.3275,4.16427 3.4228,10.11859 0.2306,14.40822 -1.5708,2.11085 -3.9931,3.69591 -6.5274,4.27139 -1.2933,0.29367 -1.0001,0.2879 -14.6029,0.2879 h -12.6625 z"
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.248333"
+ d="m 1803.7819,659.47175 c 0,-2.937 -0.014,-7.28265 -0.032,-9.65715 l -0.032,-4.31719 h 10.9676 c 7.3534,0 11.1011,0.0166 11.3728,0.0499 2.5232,0.31046 4.8161,1.55814 6.3896,3.4771 2.8421,3.46604 2.9235,8.42213 0.1969,11.99254 -1.3416,1.75691 -3.4106,3.07625 -5.5752,3.55527 -1.1046,0.24446 -0.8542,0.23963 -12.4728,0.23963 h -10.8154 z"
id="path3131-318" />
<rect
- style="fill:#ff0000;stroke:none;stroke-width:1.7401"
+ style="fill:#ff0000;stroke:none;stroke-width:1.46719"
id="rect2754-55"
- width="75.981194"
- height="23.278763"
- x="1742.9625"
- y="566.60181"
- ry="11.639381" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:1.63782"
- d="m 1781.9119,566.50348 0.03,23.49154"
+ width="64.897758"
+ height="19.375877"
+ x="1769.7781"
+ y="610.47351"
+ ry="9.6879387" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:1.38095"
+ d="m 1803.0459,610.39166 0.026,19.55303"
id="path3006-45" />
<path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.294525"
- d="m 1782.7832,583.43921 c 0,-3.52859 -0.017,-8.74968 -0.037,-11.60241 l -0.037,-5.18681 h 12.8408 c 8.6092,0 12.997,0.02 13.315,0.0598 2.9542,0.37292 5.6387,1.87202 7.4809,4.17744 3.3275,4.16428 3.4228,10.1186 0.2306,14.40822 -1.5708,2.11086 -3.9931,3.69592 -6.5274,4.2714 -1.2934,0.29367 -1.0001,0.2879 -14.6029,0.2879 h -12.6625 z"
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.248333"
+ d="m 1803.7901,624.48803 c 0,-2.937 -0.014,-7.28274 -0.032,-9.65716 l -0.032,-4.31727 h 10.9677 c 7.3534,0 11.1011,0.0167 11.3727,0.0499 2.5233,0.31047 4.8162,1.55823 6.3897,3.47711 2.8421,3.46612 2.9235,8.42213 0.1969,11.99254 -1.3416,1.75699 -3.4106,3.07625 -5.5752,3.55526 -1.1047,0.24446 -0.8542,0.23963 -12.4728,0.23963 h -10.8154 z"
id="path3131-14" />
<rect
- style="fill:#ff0000;stroke:none;stroke-width:1.7401"
+ style="fill:#ff0000;stroke:none;stroke-width:1.46719"
id="rect2754-9"
- width="75.981194"
- height="23.278763"
- x="1742.8951"
- y="452.52145"
- ry="11.639381" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:1.63782"
- d="m 1781.8445,452.4231 0.03,23.49154"
+ width="64.897758"
+ height="19.375877"
+ x="1769.7206"
+ y="515.51978"
+ ry="9.6879387" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:1.38095"
+ d="m 1802.9883,515.43791 0.026,19.55295"
id="path3006-5" />
<path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.294525"
- d="m 1782.7157,469.35883 c 0,-3.52859 -0.017,-8.74967 -0.037,-11.6024 l -0.037,-5.18681 h 12.8408 c 8.6093,0 12.9971,0.02 13.315,0.0598 2.9541,0.37292 5.6387,1.87202 7.4809,4.17745 3.3275,4.16428 3.4229,10.1186 0.2305,14.40822 -1.5707,2.11086 -3.993,3.69592 -6.5273,4.2714 -1.2934,0.29367 -1.0001,0.2879 -14.6029,0.2879 h -12.6625 z"
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.248333"
+ d="m 1803.7324,529.5342 c 0,-2.937 -0.014,-7.28274 -0.032,-9.65716 l -0.032,-4.31719 h 10.9677 c 7.3535,0 11.1012,0.0167 11.3728,0.0499 2.5231,0.31038 4.8161,1.55815 6.3896,3.47703 2.8421,3.46611 2.9236,8.42212 0.1969,11.99254 -1.3416,1.75698 -3.4105,3.07633 -5.5752,3.55526 -1.1047,0.24446 -0.8542,0.23963 -12.4727,0.23963 h -10.8154 z"
id="path3131-95" />
<path
- style="fill:#ff5599;stroke:none;stroke-width:4.13957"
+ style="fill:#ff5599;stroke:none;stroke-width:3.49034"
id="path5369"
sodipodi:type="arc"
- sodipodi:cx="1673.282"
- sodipodi:cy="684.24536"
- sodipodi:rx="157.82628"
- sodipodi:ry="156.89438"
+ sodipodi:cx="1710.2618"
+ sodipodi:cy="708.39313"
+ sodipodi:rx="134.80403"
+ sodipodi:ry="130.58968"
sodipodi:start="0"
sodipodi:end="6.2831824"
sodipodi:arc-type="slice"
- d="M 1831.1083,684.24536 A 157.82628,156.89438 0 0 1 1673.282,841.13974 157.82628,156.89438 0 0 1 1515.4557,684.24559 157.82628,156.89438 0 0 1 1673.2816,527.35098 157.82628,156.89438 0 0 1 1831.1083,684.24491 l -157.8263,4.5e-4 z" />
+ d="m 1845.0659,708.39313 a 134.80403,130.58968 0 0 1 -134.8041,130.58967 134.80403,130.58968 0 0 1 -134.804,-130.58948 134.80403,130.58968 0 0 1 134.8037,-130.58987 134.80403,130.58968 0 0 1 134.8044,130.5893 l -134.8041,3.8e-4 z" />
<path
- style="fill:#ff2a7f;stroke:none;stroke-width:5.5803"
+ style="fill:#ff2a7f;stroke:none;stroke-width:4.70511"
id="path6103"
sodipodi:type="arc"
- sodipodi:cx="1672.1742"
- sodipodi:cy="675.6875"
- sodipodi:rx="93.588219"
- sodipodi:ry="91.284012"
+ sodipodi:cx="1709.3157"
+ sodipodi:cy="701.27008"
+ sodipodi:rx="79.936432"
+ sodipodi:ry="75.979454"
sodipodi:start="0"
sodipodi:end="6.2831824"
sodipodi:arc-type="slice"
- d="m 1765.7624,675.6875 a 93.588219,91.284012 0 0 1 -93.5882,91.28401 93.588219,91.284012 0 0 1 -93.5882,-91.28388 93.588219,91.284012 0 0 1 93.588,-91.28414 93.588219,91.284012 0 0 1 93.5884,91.28374 l -93.5882,2.7e-4 z" />
+ d="m 1789.2521,701.27008 a 79.936432,75.979454 0 0 1 -79.9364,75.97945 79.936432,75.979454 0 0 1 -79.9365,-75.97934 79.936432,75.979454 0 0 1 79.9363,-75.97956 79.936432,75.979454 0 0 1 79.9366,75.97923 l -79.9364,2.2e-4 z" />
<path
- style="fill:#5599ff;stroke:none;stroke-width:4.13957"
+ style="fill:#5599ff;stroke:none;stroke-width:3.49034"
id="path5373"
sodipodi:type="arc"
- sodipodi:cx="1671.6213"
- sodipodi:cy="688.23914"
- sodipodi:rx="50.947433"
- sodipodi:ry="51.347256"
+ sodipodi:cx="1708.8435"
+ sodipodi:cy="711.71729"
+ sodipodi:rx="43.515694"
+ sodipodi:ry="42.738445"
sodipodi:start="0"
sodipodi:end="6.2831824"
sodipodi:arc-type="slice"
- d="m 1722.5688,688.23914 a 50.947433,51.347256 0 0 1 -50.9475,51.34725 50.947433,51.347256 0 0 1 -50.9474,-51.34718 50.947433,51.347256 0 0 1 50.9473,-51.34733 50.947433,51.347256 0 0 1 50.9476,51.34711 l -50.9475,1.5e-4 z" />
+ d="m 1752.3592,711.71729 a 43.515694,42.738445 0 0 1 -43.5157,42.73844 43.515694,42.738445 0 0 1 -43.5157,-42.73838 43.515694,42.738445 0 0 1 43.5156,-42.73851 43.515694,42.738445 0 0 1 43.5158,42.73832 l -43.5157,1.3e-4 z" />
<path
- style="fill:#d42aff;stroke:#dd55ff;stroke-width:5.62071"
- d="m 1700.3419,801.94509 c -18.3882,15.51938 -18.3882,15.51938 -18.3882,15.51938"
+ style="fill:#d42aff;stroke:#dd55ff;stroke-width:4.73919"
+ d="m 1733.3746,806.35944 c -15.7059,12.91744 -15.7059,12.91744 -15.7059,12.91744"
id="path7113-5" />
<path
- style="fill:#d42aff;stroke:#dd55ff;stroke-width:5.62071"
- d="m 1546.6592,651.23143 c -15.6709,18.41432 -15.6709,18.41432 -15.6709,18.41432"
+ style="fill:#d42aff;stroke:#dd55ff;stroke-width:4.73919"
+ d="m 1602.1097,680.91428 c -13.385,15.32698 -13.385,15.32698 -13.385,15.32698"
id="path7113-4" />
<path
- style="fill:#d42aff;stroke:#dd55ff;stroke-width:5.62071"
- d="m 1637.9382,620.58476 c -17.3191,16.77381 -17.3191,16.77381 -17.3191,16.77381"
+ style="fill:#d42aff;stroke:#dd55ff;stroke-width:4.73919"
+ d="m 1680.0737,655.40576 c -14.7927,13.96153 -14.7927,13.96153 -14.7927,13.96153"
id="path7113-54" />
<path
- style="fill:#d42aff;stroke:#dd55ff;stroke-width:5.62071"
- d="m 1680.5424,542.03337 c 14.8522,19.12075 14.8522,19.12075 14.8522,19.12075"
+ style="fill:#d42aff;stroke:#dd55ff;stroke-width:4.73919"
+ d="m 1716.4632,590.02419 c 12.6857,15.91503 12.6857,15.91503 12.6857,15.91503"
id="path7113" />
<path
- style="fill:#d42aff;stroke:#dd55ff;stroke-width:5.62071"
- d="m 1782.0601,625.32873 c -13.4456,20.19539 -13.4456,20.19539 -13.4456,20.19539"
+ style="fill:#d42aff;stroke:#dd55ff;stroke-width:4.73919"
+ d="m 1803.1725,659.35439 c -11.4843,16.80947 -11.4843,16.80947 -11.4843,16.80947"
id="path7113-1" />
<path
- style="fill:#ffe680;stroke:#ffe680;stroke-width:5.62071"
- d="m 1740.5528,569.25303 c -13.4456,20.1954 -13.4456,20.1954 -13.4456,20.1954"
+ style="fill:#ffe680;stroke:#ffe680;stroke-width:4.73919"
+ d="m 1767.7199,612.68027 c -11.4843,16.80947 -11.4843,16.80947 -11.4843,16.80947"
id="path7113-1-9" />
<path
- style="fill:#ffe680;stroke:#ffe680;stroke-width:5.62071"
- d="M 1768.9951,682.15561 C 1750.353,666.96107 1750.353,666.96107 1750.353,666.96107"
+ style="fill:#ffe680;stroke:#ffe680;stroke-width:4.73919"
+ d="m 1792.0133,706.65377 c -15.9228,-12.64709 -15.9228,-12.64709 -15.9228,-12.64709"
id="path7113-1-9-8" />
<path
- style="fill:#ffe680;stroke:#ffe680;stroke-width:5.62071"
- d="m 1705.5503,773.2235 c 21.3174,10.83555 21.3174,10.83555 21.3174,10.83555"
+ style="fill:#ffe680;stroke:#ffe680;stroke-width:4.73919"
+ d="m 1737.8232,782.45335 c 18.2078,9.01883 18.2078,9.01883 18.2078,9.01883"
id="path7113-1-9-9" />
<path
- style="fill:#ffe680;stroke:#ffe680;stroke-width:5.62071"
- d="m 1804.5364,737.62233 c -20.8066,11.84241 -20.8066,11.84241 -20.8066,11.84241"
+ style="fill:#ffe680;stroke:#ffe680;stroke-width:4.73919"
+ d="m 1822.3701,752.821 c -17.7715,9.85692 -17.7715,9.85692 -17.7715,9.85692"
id="path7113-1-9-7" />
<path
- style="fill:#ffe680;stroke:#ffe680;stroke-width:5.62071"
- d="m 1627.3012,795.06697 c -19.5402,13.94559 -19.5402,13.94559 -19.5402,13.94559"
+ style="fill:#ffe680;stroke:#ffe680;stroke-width:4.73919"
+ d="m 1670.9884,800.63451 c -16.6899,11.6075 -16.6899,11.6075 -16.6899,11.6075"
id="path7113-1-9-99" />
<path
- style="fill:#ffe680;stroke:#ffe680;stroke-width:5.62071"
- d="m 1544.9076,688.55969 c 23.0743,5.88482 23.0743,5.88482 23.0743,5.88482"
+ style="fill:#ffe680;stroke:#ffe680;stroke-width:4.73919"
+ d="m 1600.6136,711.98408 c 19.7084,4.89825 19.7084,4.89825 19.7084,4.89825"
id="path7113-1-9-1" />
<path
- style="fill:#ffe680;stroke:#ffe680;stroke-width:5.62071"
- d="m 1581.3429,578.19483 c 4.2414,24.09662 4.2414,24.09662 4.2414,24.09662"
+ style="fill:#ffe680;stroke:#ffe680;stroke-width:4.73919"
+ d="m 1631.734,620.1229 c 3.6227,20.0566 3.6227,20.0566 3.6227,20.0566"
id="path7113-1-9-4" />
<path
- style="fill:#ffe680;stroke:#ffe680;stroke-width:5.62071"
- d="m 1658.4232,565.40445 c -23.0473,-5.99491 -23.0473,-5.99491 -23.0473,-5.99491"
+ style="fill:#ffe680;stroke:#ffe680;stroke-width:4.73919"
+ d="m 1697.5706,609.47692 c -19.6854,-4.9898 -19.6854,-4.9898 -19.6854,-4.9898"
id="path7113-1-9-15" />
<path
- style="fill:#00aa00;stroke:#00d400;stroke-width:5.62071"
- d="m 1562.218,756.66718 c -11.5465,-21.40623 -11.5465,-21.40623 -11.5465,-21.40623"
+ style="fill:#00aa00;stroke:#00d400;stroke-width:4.73919"
+ d="m 1615.3989,768.67277 c -9.8622,-17.81726 -9.8622,-17.81726 -9.8622,-17.81726"
id="path7113-1-9-996" />
<path
- style="fill:#00aa00;stroke:#00d400;stroke-width:5.62071"
- d="m 1796.4278,652.42771 c 11.0742,21.66965 11.0742,21.66965 11.0742,21.66965"
+ style="fill:#00aa00;stroke:#00d400;stroke-width:4.73919"
+ d="m 1815.4443,681.91001 c 9.4588,18.0365 9.4588,18.0365 9.4588,18.0365"
id="path7113-1-9-996-2" />
<path
- style="fill:#00aa00;stroke:#00d400;stroke-width:5.62071"
- d="M 1755.2692,590.84165 C 1778.96,588.8378 1778.96,588.8378 1778.96,588.8378"
+ style="fill:#00aa00;stroke:#00d400;stroke-width:4.73919"
+ d="m 1780.2896,630.64935 c 20.235,-1.66784 20.235,-1.66784 20.235,-1.66784"
id="path7113-1-9-996-9" />
<path
- style="fill:#00aa00;stroke:#00d400;stroke-width:5.62071"
- d="m 1714.3171,596.68575 c -13.4456,20.1954 -13.4456,20.1954 -13.4456,20.1954"
+ style="fill:#00aa00;stroke:#00d400;stroke-width:4.73919"
+ d="m 1745.3112,635.51364 c -11.4843,16.80947 -11.4843,16.80947 -11.4843,16.80947"
id="path7113-1-9-996-83" />
<path
- style="fill:#00aa00;stroke:#00d400;stroke-width:5.62071"
- d="m 1578.6633,639.12187 c -16.2434,-17.87992 -16.2434,-17.87992 -16.2434,-17.87992"
+ style="fill:#00aa00;stroke:#00d400;stroke-width:4.73919"
+ d="m 1629.4453,670.83496 c -13.8739,-14.88218 -13.8739,-14.88218 -13.8739,-14.88218"
id="path7113-1-9-996-23" />
<path
- style="fill:#00aa00;stroke:#ff6600;stroke-width:5.62071"
- d="m 1604.6749,689.0694 c -13.4457,20.19541 -13.4457,20.19541 -13.4457,20.19541"
+ style="fill:#00aa00;stroke:#ff6600;stroke-width:4.73919"
+ d="m 1651.6626,712.40841 c -11.4844,16.80947 -11.4844,16.80947 -11.4844,16.80947"
id="path7113-1-9-996-6" />
<path
- style="fill:#00aa00;stroke:#ff6600;stroke-width:5.62071"
- d="m 1579.1556,765.6966 c 3.1343,24.27562 3.1343,24.27562 3.1343,24.27562"
+ style="fill:#00aa00;stroke:#ff6600;stroke-width:4.73919"
+ d="m 1629.8658,776.1884 c 2.6771,20.20558 2.6771,20.20558 2.6771,20.20558"
id="path7113-1-9-996-6-5" />
<path
- style="fill:#00aa00;stroke:#ff6600;stroke-width:5.62071"
- d="m 1791.7774,695.82379 c -1.5536,24.43724 -1.5536,24.43724 -1.5536,24.43724"
+ style="fill:#00aa00;stroke:#ff6600;stroke-width:4.73919"
+ d="m 1811.4723,718.03029 c -1.327,20.34018 -1.327,20.34018 -1.327,20.34018"
id="path7113-1-9-996-6-3" />
<path
- style="fill:#00aa00;stroke:#ff6600;stroke-width:5.62071"
- d="m 1607.1874,574.90035 c 19.121,14.54865 19.121,14.54865 19.121,14.54865"
+ style="fill:#00aa00;stroke:#ff6600;stroke-width:4.73919"
+ d="m 1653.8086,617.38075 c 16.3318,12.10948 16.3318,12.10948 16.3318,12.10948"
id="path7113-1-9-996-6-1" />
<path
- style="fill:#00aa00;stroke:#00d400;stroke-width:5.62071"
- d="m 1683.7357,787.16199 c -23.5505,-3.32513 -23.5505,-3.32513 -23.5505,-3.32513"
+ style="fill:#00aa00;stroke:#00d400;stroke-width:4.73919"
+ d="m 1719.1907,794.05485 c -20.1151,-2.76761 -20.1151,-2.76761 -20.1151,-2.76761"
id="path7113-1-9-996-8" />
<path
- style="fill:#00aa00;stroke:#00d400;stroke-width:5.62071"
- d="m 1758.1738,717.30896 c -13.4456,20.1954 -13.4456,20.1954 -13.4456,20.1954"
+ style="fill:#00aa00;stroke:#00d400;stroke-width:4.73919"
+ d="m 1782.7705,735.91331 c -11.4843,16.80947 -11.4843,16.80947 -11.4843,16.80947"
id="path7113-1-9-996-4" />
<path
- style="fill:#d42aff;stroke:#dd55ff;stroke-width:5.62071"
- d="m 1769.684,761.23083 c 2.6926,24.33192 2.6926,24.33192 2.6926,24.33192"
+ style="fill:#d42aff;stroke:#dd55ff;stroke-width:4.73919"
+ d="m 1792.6017,772.47133 c 2.2998,20.25244 2.2998,20.25244 2.2998,20.25244"
id="path7113-2" />
<path
- style="fill:#d42aff;stroke:#dd55ff;stroke-width:5.62071"
- d="m 1603.0564,749.7166 c 14.8523,19.12076 14.8523,19.12076 14.8523,19.12076"
+ style="fill:#d42aff;stroke:#dd55ff;stroke-width:4.73919"
+ d="m 1650.2802,762.88758 c 12.6858,15.91495 12.6858,15.91495 12.6858,15.91495"
id="path7113-9" />
<path
- style="fill:#d40055;stroke:none;stroke-width:2.513"
- d="m 1994.6777,434.34942 43.0905,119.03481 126.7048,0.18733 40.5235,-119.40971 z"
+ style="fill:#d40055;stroke:none;stroke-width:2.11887"
+ d="m 1984.7754,500.39443 36.8048,99.07758 108.2223,0.1559 34.6123,-99.38963 z"
id="path8471"
sodipodi:nodetypes="ccccc" />
<path
- style="fill:#d40055;stroke:#11002b;stroke-width:2.513"
- d="m 2004.7627,433.41217 35.9395,98.97696"
+ style="fill:#d40055;stroke:#11002b;stroke-width:2.11887"
+ d="m 1993.3893,499.61427 30.6969,82.38265"
id="path8529" />
<path
- style="fill:#d40055;stroke:#11002b;stroke-width:2.513"
- d="m 2017.965,434.9118 23.4704,69.73377"
+ style="fill:#d40055;stroke:#11002b;stroke-width:2.11887"
+ d="m 2004.6657,500.86254 20.0468,58.04224"
id="path8531" />
<path
- style="fill:#d40055;stroke:#11002b;stroke-width:2.513"
- d="m 2031.1672,434.16199 40.3403,108.72468"
+ style="fill:#d40055;stroke:#11002b;stroke-width:2.11887"
+ d="m 2015.9421,500.23845 34.4559,90.49597"
id="path8533" />
<rect
- style="fill:#ffd5e5;stroke:none;stroke-width:2.88939"
+ style="fill:#ffd5e5;stroke:none;stroke-width:2.43623"
id="rect8587"
- width="255.97668"
- height="56.236904"
- x="1967.7234"
- y="377.92511"
- ry="28.118452" />
+ width="218.63716"
+ height="46.8083"
+ x="1961.7528"
+ y="453.43018"
+ ry="23.40415" />
<rect
- style="fill:#ffd5e5;stroke:none;stroke-width:2.42386"
+ style="fill:#ffd5e5;stroke:none;stroke-width:2.04371"
id="rect8587-5"
- width="180.1394"
- height="56.236904"
- x="2009.3357"
- y="340.05884"
- ry="28.118452" />
+ width="153.86234"
+ height="46.8083"
+ x="1997.295"
+ y="421.91245"
+ ry="23.40415" />
<ellipse
- style="fill:#d40000;stroke:none;stroke-width:2.32302"
+ style="fill:#d40000;stroke:none;stroke-width:1.95869"
id="path8928"
- cx="2097.9644"
- cy="297.97498"
- rx="30.621855"
- ry="29.711832" />
+ cx="2072.9954"
+ cy="386.88431"
+ rx="26.155022"
+ ry="24.730387" />
<rect
- style="fill:#ffd5e5;stroke:none;stroke-width:1.81714"
+ style="fill:#ffd5e5;stroke:none;stroke-width:1.53215"
id="rect8587-5-6"
- width="101.24242"
- height="56.236904"
- x="2046.5834"
- y="310.4408"
- ry="28.118452" />
- <path
- style="fill:#aaccff;fill-opacity:1;stroke:none;stroke-width:18.2697"
- d="M 1400.9308,846.98284 H 2575.2596"
- id="path42904" />
- <path
- style="fill:#0b1728;fill-opacity:1;stroke:none;stroke-width:18.2697"
- d="m 1426.3622,838.848 1128.6094,1.44451"
- id="path42906" />
+ width="86.474106"
+ height="46.8083"
+ x="2029.1093"
+ y="397.26013"
+ ry="23.40415" />
</g>
</svg>
diff --git a/src/components/HomePage.tsx b/src/components/HomePage.tsx
index 50956ffd938b5b30924213143dded9ff982ceed5..518607dcea30ad7c0f4c102f284ae4e3f5e243c0 100644
--- a/src/components/HomePage.tsx
+++ b/src/components/HomePage.tsx
@@ -22,9 +22,7 @@ const Intro = () => {
return (
<>
- <div className="flex-grow flex flex-col justify-center items-center">
-
- <button
+ <button
onClick={handleClick}
className="mt-20 border-2 border-black font-primary bg-primary-light z-10 absolute top-28 left-28">
{startButtonText}
@@ -52,11 +50,12 @@ const Intro = () => {
</button>
</div>
)}
+ <div className="flex absolute bottom-0 left-0 z-3">
<div className="bg-primary-dark">
- <img
+ <img
src="src/assets/backgrounds/homepage-static.svg"
alt="background picture"
- className="mt-4"
+ className=""
/>
</div>
</div>
diff --git a/src/components/Intro.tsx b/src/components/Intro.tsx
index a8633191d8255d2c65e12d853b9e5d433d32c7a4..9edf05a957e87b22cce6ea9bc3dd60fc8a0bd7df 100644
--- a/src/components/Intro.tsx
+++ b/src/components/Intro.tsx
@@ -1,14 +1,17 @@
import {useRef} from 'react';
import {AnimateCC} from 'react-adobe-animate';
import Typewriter, {TypewriterClass} from "typewriter-effect";
-import {intro, nextButton, toChapter} from "../../public/lit/texts";
+import {intro, nextButton, skipToChapter, toChapter} from "../../public/lit/texts";
import {useAnimate} from "../hooks/useAnimate";
import {useTranslate} from "../hooks/useTranslate";
+import {useNavigate} from "react-router-dom";
const Intro = () => {
const nextButtonText = useTranslate(nextButton);
const chapter1Text = useTranslate(toChapter) + "1";
const typewriterRef = useRef<TypewriterClass>();
+ const navigate = useNavigate();
+ const skipButtonText = useTranslate(skipToChapter) + "1";
const {getAnimationObject, handleClick, isAnimationComplete, isLast, onInit, paused} = useAnimate({
typewriterRef,
@@ -42,7 +45,7 @@ const Intro = () => {
</div>
</div>
</div>
- <div className="mt-20 flex justify-center">
+ <div className="mt-20 flex justify-evenly">
<button
onClick={handleClick}
className={`mt-20 border-4 border-black font-primary ${
@@ -51,6 +54,12 @@ const Intro = () => {
>
{isLast ? chapter1Text : nextButtonText}
</button>
+ <button
+ onClick={() => navigate("/insulin")}
+ className={`mt-20 border-4 border-black font-primary bg-yellow-main`}
+ >
+ {skipButtonText}
+ </button>
</div>
</div>
</div>
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index 21abfd303bae7992cc0022965f4d2b9ce50d2fbb..7872e917247914e032682f2aabcb1b358e1b2612 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -9,7 +9,7 @@ const Navbar = () => {
return (
- <nav className="bg-primary-main">
+ <nav className="bg-primary-main z-10 relative w-screen">
<div className="p-2 mx-auto flex justify-between">
<div>
<img src={logo} alt="Logo"
diff --git a/src/components/Opening.tsx b/src/components/Opening.tsx
index 115da6870c1b8be616e48477d2edcc2fc07335a1..ad8f933cfcdb462b82e4700745d7b41b88ecea83 100644
--- a/src/components/Opening.tsx
+++ b/src/components/Opening.tsx
@@ -1,19 +1,22 @@
import {useRef} from 'react';
import {AnimateCC} from 'react-adobe-animate';
import Typewriter, {TypewriterClass} from "typewriter-effect";
-import {diabetesTheorem, nextButton, opening, toTest} from "../../public/lit/texts";
+import {diabetesTheorem, nextButton, opening, skipToTest, toTest} from "../../public/lit/texts";
import {useAnimate} from "../hooks/useAnimate";
import {useTranslate} from "../hooks/useTranslate";
+import {useNavigate} from "react-router-dom";
const Opening = () => {
const firstTheoremText = useTranslate(diabetesTheorem);
const nextButtonText = useTranslate(nextButton);
const testText = useTranslate(toTest);
const typewriterRef = useRef<TypewriterClass>();
+ const skipButtonText = useTranslate(skipToTest);
+ const navigate = useNavigate();
const {getAnimationObject, handleClick, isAnimationComplete, isLast, onInit, paused} = useAnimate({
typewriterRef,
- link: '/InsulinTest',
+ link: '/insulinTest',
text: opening
});
@@ -50,7 +53,7 @@ const Opening = () => {
</div>
</div>
</div>
- <div className="flex justify-center">
+ <div className="flex justify-evenly">
<button
onClick={handleClick}
className={`border-4 border-black font-primary ${
@@ -59,6 +62,12 @@ const Opening = () => {
>
{isLast ? testText : nextButtonText}
</button>
+ <button
+ onClick={() => navigate("/insulinTest")}
+ className={`border-4 border-black font-primary bg-yellow-main`}
+ >
+ {skipButtonText}
+ </button>
</div>
</div>
</div>
diff --git a/src/index.css b/src/index.css
index f8d566eaf0e482f5e3868af98940e35d01ae82f6..ebd04e8e3ebec8bfc844ebac3037235c34bd6178 100644
--- a/src/index.css
+++ b/src/index.css
@@ -26,6 +26,9 @@ body {
place-items: center;
min-width: 320px;
min-height: 100vh;
+ display: flex;
+ flex-direction: column;
+ position: relative;
}
h1 {
@@ -71,17 +74,6 @@ strong {
.animate-fade-in {
animation: fade-in 1s ease-in-out;
}
-/*.container {*/
-/* display: grid;*/
-/* grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr;*/
-/* grid-template-rows: 10rem 30rem 10rem;*/
-/* gap: 0 0;*/
-/* grid-auto-flow: row;*/
-/* grid-template-areas:*/
-/* ". text text text text text text text ."*/
-/* ". . . girly girly girly . . ."*/
-/* ". . . . buttonArea . . . .";*/
-/*}*/
.button {
/*grid-area: buttonArea;*/