summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--rannak/mangud/kaitseliitlane/kuulsused/styles.css4
-rw-r--r--rannak/mangud/perenaine/memori/img/image.svg26
-rw-r--r--rannak/mangud/perenaine/memori/img/jahu.svg108
-rw-r--r--rannak/mangud/perenaine/memori/img/jahu.svg.bak85
-rw-r--r--rannak/mangud/perenaine/memori/img/pesu.svg35
-rw-r--r--rannak/mangud/perenaine/memori/img/pesu.svg.bak46
-rw-r--r--rannak/mangud/perenaine/memori/img/suhkur.svg26
-rw-r--r--rannak/mangud/perenaine/memori/img/suhkur.svg.bak47
-rw-r--r--rannak/mangud/perenaine/memori/img/taga.svg67
-rw-r--r--rannak/mangud/perenaine/memori/index.html30
-rw-r--r--rannak/mangud/perenaine/memori/script.js1
-rw-r--r--rannak/mangud/perenaine/memori/style.css15
-rw-r--r--rannak/mangud/perenaine/ristsona/index.html16
-rw-r--r--rannak/mangud/perenaine/ristsona/script.js274
-rw-r--r--rannak/mangud/perenaine/ristsona/style.css7
15 files changed, 637 insertions, 150 deletions
diff --git a/rannak/mangud/kaitseliitlane/kuulsused/styles.css b/rannak/mangud/kaitseliitlane/kuulsused/styles.css
index 0a6d4b3..f22b919 100644
--- a/rannak/mangud/kaitseliitlane/kuulsused/styles.css
+++ b/rannak/mangud/kaitseliitlane/kuulsused/styles.css
@@ -2,6 +2,10 @@
box-sizing: border-box !important;
}
+.lists{
+ overflow: scroll !important;
+}
+
img {
max-width: 15rem !important;
height: auto !important;
diff --git a/rannak/mangud/perenaine/memori/img/image.svg b/rannak/mangud/perenaine/memori/img/image.svg
new file mode 100644
index 0000000..f3b93be
--- /dev/null
+++ b/rannak/mangud/perenaine/memori/img/image.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="1920" height="1440" viewBox="0 0 640 480" xml:space="preserve">
+<desc>Created with Fabric.js 3.6.3</desc>
+<defs>
+</defs>
+<g transform="matrix(1 0 0 1 32 32)" >
+<g style="" >
+ <g transform="matrix(1 0 0 1 22 2.5)" >
+<path style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(188,194,215); fill-rule: nonzero; opacity: 1;" transform=" translate(-54, -34.5)" d="M 55 20 H 49 a 1 1 0 0 0 -1 1 V 48 a 1 1 0 0 0 1 1 A 11 11 0 0 0 60 38 V 25 A 5 5 0 0 0 55 20 Z M 50 42.9 V 26 h 3 a 1 1 0 0 1 1 1 V 38 A 5 5 0 0 1 50 42.9 Z" stroke-linecap="round" />
+</g>
+ <g transform="matrix(1 0 0 1 -3 8.82)" >
+<path style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(171,124,115); fill-rule: nonzero; opacity: 1;" transform=" translate(-29, -40.83)" d="M 48.66 18.71 A 4.91 4.91 0 0 1 47 19 H 36 a 1 1 0 0 0 -1 1 v 7 a 2 2 0 0 1 -4 0 V 23 a 4 4 0 0 0 -8 0 V 34 a 2 2 0 0 1 -4 0 V 20 a 1 1 0 0 0 -1 -1 H 9 a 1 1 0 0 0 -1 1 V 54 a 9 9 0 0 0 9 9 H 41 a 9 9 0 0 0 9 -9 V 19.65 A 1 1 0 0 0 48.66 18.71 Z" stroke-linecap="round" />
+</g>
+ <g transform="matrix(1 0 0 1 -15.5 22.5)" >
+<path style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(110,91,94); fill-rule: nonzero; opacity: 1;" transform=" translate(-16.5, -54.5)" d="M 20 59 H 17 a 5 5 0 0 1 -5 -5 V 51 a 1 1 0 0 1 2 0 v 3 a 3 3 0 0 0 3 3 h 3 a 1 1 0 0 1 0 2 Z" stroke-linecap="round" />
+</g>
+ <g transform="matrix(1 0 0 1 -2.99 -12.5)" >
+<path style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(239,243,254); fill-rule: nonzero; opacity: 1;" transform=" translate(-29.01, -19.5)" d="M 48 7.07 A 7.09 7.09 0 0 0 41.4 5.19 A 7 7 0 0 0 29.51 3.65 a 7 7 0 0 0 -8.42 -0.45 A 7 7 0 0 0 9.16 6.52 A 8 8 0 0 0 7.89 20.86 A 1 1 0 0 0 8.4 21 H 17 V 34 a 4 4 0 0 0 8 0 V 23 a 2 2 0 0 1 4 0 v 4 a 4 4 0 0 0 8 0 V 21 H 47 A 7 7 0 0 0 48 7.07 Z" stroke-linecap="round" />
+</g>
+</g>
+</g>
+<g transform="matrix(1 0 0 1 31.83 78.34)" style="" >
+ <text xml:space="preserve" font-family="'Open Sans', sans-serif" font-size="18" font-style="normal" font-weight="bold" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(0,0,0); fill-rule: nonzero; opacity: 1; white-space: pre;" ><tspan x="-15.82" y="5.65" >Õlu</tspan></text>
+</g>
+</svg> \ No newline at end of file
diff --git a/rannak/mangud/perenaine/memori/img/jahu.svg b/rannak/mangud/perenaine/memori/img/jahu.svg
index 3ac729f..1bb651a 100644
--- a/rannak/mangud/perenaine/memori/img/jahu.svg
+++ b/rannak/mangud/perenaine/memori/img/jahu.svg
@@ -1,56 +1,64 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 459.527 459.527" style="enable-background:new 0 0 459.527 459.527;" xml:space="preserve">
-<g>
- <path d="M412.027,66.276h-22.556L269.437,18.262c-26.704-10.682-56.116-10.682-82.82,0L66.583,66.276H47.499
- c-13.246,0-25.986,5.59-34.955,15.337C3.576,91.36-0.937,104.521,0.163,117.721l2.276,27.313
- c0.717,8.609,5.003,16.634,11.759,22.019c6.109,4.868,13.873,7.275,21.627,6.791L23.438,390.61
- c-0.88,15.401,4.469,30.06,15.062,41.275c10.592,11.215,24.922,17.392,40.348,17.392h298.358c15.427,0,29.756-6.176,40.348-17.391
- c10.593-11.215,15.941-25.874,15.062-41.275L419.98,169.495l0.407,0.102c9.475,2.37,19.327,0.281,27.025-5.731
- c7.699-6.011,12.114-15.061,12.114-24.829v-25.261C459.527,87.584,438.218,66.276,412.027,66.276z M192.188,32.189
- c23.11-9.244,48.567-9.244,71.678,0l85.217,34.087H106.971L192.188,32.189z M417.64,391.465
- c0.642,11.239-3.261,21.936-10.991,30.12s-18.186,12.691-29.443,12.691H78.848c-11.257,0-21.713-4.507-29.443-12.691
- c-7.729-8.184-11.633-18.881-10.991-30.12l12.553-219.676l66.077-9.44c4.711-0.674,9.5-0.748,14.23-0.222l123.794,13.755
- c2.648,0.294,5.295,0.441,7.936,0.441c6.327,0,12.614-0.843,18.773-2.523l60.087-16.388c9.321-2.542,19.2-2.646,28.57-0.304
- l34.304,8.576L417.64,391.465z M444.527,139.037c0,5.116-2.313,9.857-6.346,13.005c-4.032,3.148-9.191,4.245-14.156,3.002v0
- l-49.953-12.488c-11.858-2.966-24.361-2.832-36.154,0.384l-60.087,16.388c-6.898,1.881-13.998,2.434-21.105,1.646L132.93,147.219
- c-2.623-0.292-5.259-0.437-7.895-0.437c-3.381,0-6.762,0.24-10.112,0.718l-78.76,11.251c-4.542,0.65-9.026-0.569-12.617-3.43
- c-3.591-2.862-5.778-6.958-6.159-11.534l-0.593-7.116l76.997-10.999c20.229-2.89,40.813-3.561,61.182-1.993l72.479,5.575
- c4.136,0.322,7.735-2.773,8.053-6.903c0.317-4.13-2.773-7.735-6.903-8.053l-72.479-5.575c-21.459-1.652-43.145-0.945-64.454,2.1
- l-76.123,10.875l-0.435-5.222c-0.764-9.164,2.245-17.938,8.472-24.705c6.227-6.768,14.72-10.494,23.916-10.494h364.528
- c17.92,0,32.5,14.58,32.5,32.5V139.037z"/>
- <path d="M423.381,115.068l-16-8c-3.703-1.852-8.209-0.351-10.062,3.354s-0.351,8.21,3.354,10.062l16,8
- c1.077,0.539,2.221,0.793,3.348,0.793c2.751,0,5.4-1.52,6.714-4.147C428.588,121.425,427.086,116.92,423.381,115.068z"/>
- <path d="M372.027,98.276h-0.364c-16.297,0-32.576,2.004-48.386,5.957l-9.069,2.267c-4.019,1.005-6.462,5.077-5.458,9.095
- c0.852,3.408,3.91,5.683,7.271,5.683c0.602,0,1.214-0.073,1.825-0.226l9.07-2.268c14.621-3.655,29.676-5.509,44.748-5.509h0.364
- c4.142,0,7.5-3.358,7.5-7.5S376.169,98.276,372.027,98.276z"/>
- <path d="M375.23,210.202c0.228,3.99,3.535,7.072,7.481,7.072c0.144,0,0.289-0.004,0.435-0.012c4.136-0.236,7.296-3.78,7.06-7.916
- l-0.898-15.714c-0.236-4.135-3.777-7.297-7.916-7.06c-4.136,0.236-7.296,3.78-7.06,7.916L375.23,210.202z"/>
- <path d="M384.119,234.29c-4.136,0.236-7.296,3.78-7.06,7.916l5.942,103.993c0.228,3.99,3.535,7.072,7.481,7.072
- c0.144,0,0.289-0.004,0.435-0.012c4.136-0.236,7.296-3.78,7.06-7.916l-5.942-103.993
- C391.798,237.215,388.248,234.061,384.119,234.29z"/>
- <path d="M272.027,269.276c1.919,0,3.839-0.732,5.303-2.197l20-20c2.929-2.929,2.929-7.678,0-10.606
- c-2.929-2.929-7.678-2.929-10.606,0l-20,20c-2.929,2.929-2.929,7.678,0,10.606C268.188,268.543,270.108,269.276,272.027,269.276z"
+<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 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<rect x="48.608" y="9.722" style="fill:#98C8ED;" width="414.785" height="492.557"/>
+<path style="fill:#F8E99B;" d="M211.929,256c38.657,0,69.995-31.338,69.995-69.995C243.267,186.005,211.929,217.343,211.929,256z"/>
+<path style="fill:#F6E27D;" d="M255.798,191.064c-1.947,27.219-19.444,50.12-43.666,59.877c-0.119,1.673-0.202,3.356-0.202,5.059
+ c38.657,0,69.995-31.338,69.995-69.995C272.685,186.005,263.873,187.812,255.798,191.064z"/>
+<path style="fill:#F8E99B;" d="M211.929,313.033c38.657,0,69.995-31.338,69.995-69.995
+ C243.267,243.038,211.929,274.376,211.929,313.033z"/>
+<path style="fill:#F6E27D;" d="M255.798,248.097c-1.947,27.219-19.444,50.12-43.666,59.877c-0.119,1.673-0.202,3.356-0.202,5.059
+ c38.657,0,69.995-31.338,69.995-69.995C272.685,243.038,263.873,244.845,255.798,248.097z"/>
+<path style="fill:#F8E99B;" d="M211.929,372.658c38.657,0,69.995-31.338,69.995-69.995
+ C243.267,302.663,211.929,334.002,211.929,372.658z"/>
+<path style="fill:#F6E27D;" d="M255.798,307.722c-1.947,27.219-19.444,50.12-43.666,59.877c-0.119,1.673-0.202,3.356-0.202,5.059
+ c38.657,0,69.995-31.338,69.995-69.995C272.685,302.663,263.873,304.47,255.798,307.722z"/>
+<g>
+ <path style="fill:#F8E99B;" d="M204.152,416.557c-5.369,0-9.722-4.351-9.722-9.722V225.367c0-5.37,4.353-9.722,9.722-9.722
+ s9.722,4.351,9.722,9.722v181.468C213.873,412.205,209.521,416.557,204.152,416.557z"/>
+ <path style="fill:#F8E99B;" d="M126.38,186.005c38.657,0,69.995,31.338,69.995,69.995C157.718,256,126.38,224.662,126.38,186.005z"
/>
- <path d="M257.33,276.473c-2.929-2.929-7.678-2.929-10.606,0l-92,92c-2.929,2.929-2.929,7.678,0,10.606
- c1.464,1.464,3.384,2.197,5.303,2.197s3.839-0.732,5.303-2.197l92-92C260.259,284.15,260.259,279.401,257.33,276.473z"/>
- <path d="M196.027,313.276c4.142,0,7.5-3.358,7.5-7.5v-24c0-4.142-3.358-7.5-7.5-7.5s-7.5,3.358-7.5,7.5v24
- C188.527,309.918,191.885,313.276,196.027,313.276z"/>
- <path d="M252.027,330.276h-24c-4.142,0-7.5,3.358-7.5,7.5s3.358,7.5,7.5,7.5h24c4.142,0,7.5-3.358,7.5-7.5
- S256.169,330.276,252.027,330.276z"/>
- <path d="M172.027,337.276c4.142,0,7.5-3.358,7.5-7.5v-24c0-4.142-3.358-7.5-7.5-7.5s-7.5,3.358-7.5,7.5v24
- C164.527,333.918,167.885,337.276,172.027,337.276z"/>
- <path d="M228.027,354.276h-24c-4.142,0-7.5,3.358-7.5,7.5s3.358,7.5,7.5,7.5h24c4.142,0,7.5-3.358,7.5-7.5
- S232.169,354.276,228.027,354.276z"/>
- <path d="M220.027,289.276c4.142,0,7.5-3.358,7.5-7.5v-24c0-4.142-3.358-7.5-7.5-7.5s-7.5,3.358-7.5,7.5v24
- C212.527,285.918,215.885,289.276,220.027,289.276z"/>
- <path d="M276.027,306.276h-24c-4.142,0-7.5,3.358-7.5,7.5s3.358,7.5,7.5,7.5h24c4.142,0,7.5-3.358,7.5-7.5
- S280.169,306.276,276.027,306.276z"/>
- <path d="M244.027,265.276c4.142,0,7.5-3.358,7.5-7.5v-24c0-4.142-3.358-7.5-7.5-7.5s-7.5,3.358-7.5,7.5v24
- C236.527,261.918,239.885,265.276,244.027,265.276z"/>
- <path d="M300.027,282.276h-24c-4.142,0-7.5,3.358-7.5,7.5s3.358,7.5,7.5,7.5h24c4.142,0,7.5-3.358,7.5-7.5
- S304.169,282.276,300.027,282.276z"/>
+</g>
+<path style="fill:#F6E27D;" d="M170.248,250.941c8.075,3.252,16.887,5.059,26.126,5.059c0-38.657-31.338-69.995-69.995-69.995
+ c0,1.703,0.082,3.387,0.202,5.059C150.804,200.819,168.303,223.722,170.248,250.941z"/>
+<path style="fill:#F8E99B;" d="M126.38,243.038c38.657,0,69.995,31.338,69.995,69.995
+ C157.718,313.033,126.38,281.695,126.38,243.038z"/>
+<path style="fill:#F6E27D;" d="M170.248,307.974c8.075,3.252,16.887,5.059,26.126,5.059c0-38.657-31.338-69.995-69.995-69.995
+ c0,1.703,0.082,3.387,0.202,5.059C150.804,257.852,168.303,280.755,170.248,307.974z"/>
+<path style="fill:#F8E99B;" d="M126.38,302.663c38.657,0,69.995,31.338,69.995,69.995C157.718,372.658,126.38,341.32,126.38,302.663
+ z"/>
+<path style="fill:#F6E27D;" d="M170.248,367.599c8.075,3.252,16.887,5.059,26.126,5.059c0-38.657-31.338-69.995-69.995-69.995
+ c0,1.703,0.082,3.387,0.202,5.059C150.804,317.478,168.303,340.38,170.248,367.599z"/>
+<path style="fill:#F8E99B;" d="M204.152,113.418c-27.334,27.334-27.334,71.653,0,98.987
+ C231.486,185.071,231.486,140.752,204.152,113.418z"/>
+<path style="fill:#F6E27D;" d="M204.152,113.418c-3.765,3.765-6.993,7.863-9.722,12.184c14.346,22.726,14.346,51.893,0,74.62
+ c2.729,4.322,5.956,8.418,9.722,12.184C231.486,185.071,231.486,140.752,204.152,113.418z"/>
+<rect x="359.696" y="9.722" style="fill:#7AB9E8;" width="103.696" height="492.557"/>
+<rect x="411.544" y="9.722" style="fill:#61AAE4;" width="51.848" height="492.557"/>
+<g>
+ <path style="fill:#2E2D31;" d="M124.435,297.954c0,40.663,30.611,74.289,69.995,79.102v29.779c0,5.37,4.353,9.722,9.722,9.722
+ s9.722-4.351,9.722-9.722v-29.779c39.384-4.813,69.995-38.44,69.995-79.102c0-5.37-4.353-9.722-9.721-9.722
+ c-2.779,0-5.523,0.145-8.23,0.424c11.212-13.735,17.951-31.257,17.951-50.328c0-5.37-4.353-9.722-9.721-9.722
+ c-2.043,0-4.061,0.102-6.065,0.254c9.911-13.286,15.786-29.752,15.786-47.565c0-5.37-4.353-9.722-9.721-9.722
+ c-15.654,0-30.257,4.554-42.588,12.38c1.843-6.775,2.815-13.833,2.815-21.044c0-21.293-8.292-41.311-23.348-56.368
+ c-1.822-1.822-4.296-2.846-6.874-2.846s-5.051,1.024-6.874,2.846c-15.057,15.057-23.349,35.077-23.349,56.368
+ c0,7.211,0.973,14.269,2.815,21.044c-12.331-7.826-26.934-12.38-42.588-12.38c-5.369,0-9.722,4.351-9.722,9.722
+ c0,17.814,5.876,34.278,15.786,47.565c-2.004-0.152-4.022-0.254-6.065-0.254c-5.369,0-9.722,4.351-9.722,9.722
+ c0,19.071,6.739,36.593,17.951,50.328c-2.706-0.279-5.451-0.424-8.23-0.424C128.788,288.233,124.435,292.585,124.435,297.954z
+ M144.823,308.622c24.702,4.429,44.232,23.959,48.662,48.661C168.784,352.854,149.253,333.322,144.823,308.622z M263.48,248.997
+ c-4.43,24.702-23.96,44.232-48.662,48.661C219.247,272.956,238.779,253.426,263.48,248.997z M193.485,297.657
+ c-24.702-4.429-44.233-23.959-48.662-48.661C169.525,253.426,189.055,272.956,193.485,297.657z M214.818,357.283
+ c4.429-24.702,23.96-44.232,48.662-48.661C259.05,333.322,239.52,352.854,214.818,357.283z M214.818,240.624
+ c4.429-24.702,23.96-44.232,48.662-48.661C259.05,216.664,239.52,236.195,214.818,240.624z M204.152,128.486
+ c7.007,10.027,10.779,21.937,10.779,34.426c0,12.49-3.773,24.398-10.779,34.427c-7.007-10.027-10.779-21.937-10.779-34.427
+ C193.373,150.423,197.145,138.514,204.152,128.486z M193.485,240.624c-24.702-4.429-44.233-23.959-48.662-48.661
+ C169.525,196.393,189.055,215.923,193.485,240.624z"/>
+ <path style="fill:#2E2D31;" d="M463.392,51.848c-5.369,0-9.721,4.351-9.721,9.722v430.987h-84.253V19.443h93.975
+ c5.369,0,9.722-4.351,9.722-9.722S468.761,0,463.392,0H48.608c-5.369,0-9.722,4.351-9.722,9.722V385.62
+ c0,5.37,4.353,9.721,9.722,9.721s9.722-4.351,9.722-9.721V19.443h291.646v473.114H58.329v-55.089c0-5.37-4.353-9.722-9.722-9.722
+ s-9.722,4.351-9.722,9.722v64.81c0,5.37,4.353,9.722,9.722,9.722h414.785c5.369,0,9.722-4.351,9.722-9.722V61.57
+ C473.114,56.199,468.761,51.848,463.392,51.848z"/>
</g>
<g>
</g>
diff --git a/rannak/mangud/perenaine/memori/img/jahu.svg.bak b/rannak/mangud/perenaine/memori/img/jahu.svg.bak
new file mode 100644
index 0000000..3ac729f
--- /dev/null
+++ b/rannak/mangud/perenaine/memori/img/jahu.svg.bak
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 459.527 459.527" style="enable-background:new 0 0 459.527 459.527;" xml:space="preserve">
+<g>
+ <path d="M412.027,66.276h-22.556L269.437,18.262c-26.704-10.682-56.116-10.682-82.82,0L66.583,66.276H47.499
+ c-13.246,0-25.986,5.59-34.955,15.337C3.576,91.36-0.937,104.521,0.163,117.721l2.276,27.313
+ c0.717,8.609,5.003,16.634,11.759,22.019c6.109,4.868,13.873,7.275,21.627,6.791L23.438,390.61
+ c-0.88,15.401,4.469,30.06,15.062,41.275c10.592,11.215,24.922,17.392,40.348,17.392h298.358c15.427,0,29.756-6.176,40.348-17.391
+ c10.593-11.215,15.941-25.874,15.062-41.275L419.98,169.495l0.407,0.102c9.475,2.37,19.327,0.281,27.025-5.731
+ c7.699-6.011,12.114-15.061,12.114-24.829v-25.261C459.527,87.584,438.218,66.276,412.027,66.276z M192.188,32.189
+ c23.11-9.244,48.567-9.244,71.678,0l85.217,34.087H106.971L192.188,32.189z M417.64,391.465
+ c0.642,11.239-3.261,21.936-10.991,30.12s-18.186,12.691-29.443,12.691H78.848c-11.257,0-21.713-4.507-29.443-12.691
+ c-7.729-8.184-11.633-18.881-10.991-30.12l12.553-219.676l66.077-9.44c4.711-0.674,9.5-0.748,14.23-0.222l123.794,13.755
+ c2.648,0.294,5.295,0.441,7.936,0.441c6.327,0,12.614-0.843,18.773-2.523l60.087-16.388c9.321-2.542,19.2-2.646,28.57-0.304
+ l34.304,8.576L417.64,391.465z M444.527,139.037c0,5.116-2.313,9.857-6.346,13.005c-4.032,3.148-9.191,4.245-14.156,3.002v0
+ l-49.953-12.488c-11.858-2.966-24.361-2.832-36.154,0.384l-60.087,16.388c-6.898,1.881-13.998,2.434-21.105,1.646L132.93,147.219
+ c-2.623-0.292-5.259-0.437-7.895-0.437c-3.381,0-6.762,0.24-10.112,0.718l-78.76,11.251c-4.542,0.65-9.026-0.569-12.617-3.43
+ c-3.591-2.862-5.778-6.958-6.159-11.534l-0.593-7.116l76.997-10.999c20.229-2.89,40.813-3.561,61.182-1.993l72.479,5.575
+ c4.136,0.322,7.735-2.773,8.053-6.903c0.317-4.13-2.773-7.735-6.903-8.053l-72.479-5.575c-21.459-1.652-43.145-0.945-64.454,2.1
+ l-76.123,10.875l-0.435-5.222c-0.764-9.164,2.245-17.938,8.472-24.705c6.227-6.768,14.72-10.494,23.916-10.494h364.528
+ c17.92,0,32.5,14.58,32.5,32.5V139.037z"/>
+ <path d="M423.381,115.068l-16-8c-3.703-1.852-8.209-0.351-10.062,3.354s-0.351,8.21,3.354,10.062l16,8
+ c1.077,0.539,2.221,0.793,3.348,0.793c2.751,0,5.4-1.52,6.714-4.147C428.588,121.425,427.086,116.92,423.381,115.068z"/>
+ <path d="M372.027,98.276h-0.364c-16.297,0-32.576,2.004-48.386,5.957l-9.069,2.267c-4.019,1.005-6.462,5.077-5.458,9.095
+ c0.852,3.408,3.91,5.683,7.271,5.683c0.602,0,1.214-0.073,1.825-0.226l9.07-2.268c14.621-3.655,29.676-5.509,44.748-5.509h0.364
+ c4.142,0,7.5-3.358,7.5-7.5S376.169,98.276,372.027,98.276z"/>
+ <path d="M375.23,210.202c0.228,3.99,3.535,7.072,7.481,7.072c0.144,0,0.289-0.004,0.435-0.012c4.136-0.236,7.296-3.78,7.06-7.916
+ l-0.898-15.714c-0.236-4.135-3.777-7.297-7.916-7.06c-4.136,0.236-7.296,3.78-7.06,7.916L375.23,210.202z"/>
+ <path d="M384.119,234.29c-4.136,0.236-7.296,3.78-7.06,7.916l5.942,103.993c0.228,3.99,3.535,7.072,7.481,7.072
+ c0.144,0,0.289-0.004,0.435-0.012c4.136-0.236,7.296-3.78,7.06-7.916l-5.942-103.993
+ C391.798,237.215,388.248,234.061,384.119,234.29z"/>
+ <path d="M272.027,269.276c1.919,0,3.839-0.732,5.303-2.197l20-20c2.929-2.929,2.929-7.678,0-10.606
+ c-2.929-2.929-7.678-2.929-10.606,0l-20,20c-2.929,2.929-2.929,7.678,0,10.606C268.188,268.543,270.108,269.276,272.027,269.276z"
+ />
+ <path d="M257.33,276.473c-2.929-2.929-7.678-2.929-10.606,0l-92,92c-2.929,2.929-2.929,7.678,0,10.606
+ c1.464,1.464,3.384,2.197,5.303,2.197s3.839-0.732,5.303-2.197l92-92C260.259,284.15,260.259,279.401,257.33,276.473z"/>
+ <path d="M196.027,313.276c4.142,0,7.5-3.358,7.5-7.5v-24c0-4.142-3.358-7.5-7.5-7.5s-7.5,3.358-7.5,7.5v24
+ C188.527,309.918,191.885,313.276,196.027,313.276z"/>
+ <path d="M252.027,330.276h-24c-4.142,0-7.5,3.358-7.5,7.5s3.358,7.5,7.5,7.5h24c4.142,0,7.5-3.358,7.5-7.5
+ S256.169,330.276,252.027,330.276z"/>
+ <path d="M172.027,337.276c4.142,0,7.5-3.358,7.5-7.5v-24c0-4.142-3.358-7.5-7.5-7.5s-7.5,3.358-7.5,7.5v24
+ C164.527,333.918,167.885,337.276,172.027,337.276z"/>
+ <path d="M228.027,354.276h-24c-4.142,0-7.5,3.358-7.5,7.5s3.358,7.5,7.5,7.5h24c4.142,0,7.5-3.358,7.5-7.5
+ S232.169,354.276,228.027,354.276z"/>
+ <path d="M220.027,289.276c4.142,0,7.5-3.358,7.5-7.5v-24c0-4.142-3.358-7.5-7.5-7.5s-7.5,3.358-7.5,7.5v24
+ C212.527,285.918,215.885,289.276,220.027,289.276z"/>
+ <path d="M276.027,306.276h-24c-4.142,0-7.5,3.358-7.5,7.5s3.358,7.5,7.5,7.5h24c4.142,0,7.5-3.358,7.5-7.5
+ S280.169,306.276,276.027,306.276z"/>
+ <path d="M244.027,265.276c4.142,0,7.5-3.358,7.5-7.5v-24c0-4.142-3.358-7.5-7.5-7.5s-7.5,3.358-7.5,7.5v24
+ C236.527,261.918,239.885,265.276,244.027,265.276z"/>
+ <path d="M300.027,282.276h-24c-4.142,0-7.5,3.358-7.5,7.5s3.358,7.5,7.5,7.5h24c4.142,0,7.5-3.358,7.5-7.5
+ S304.169,282.276,300.027,282.276z"/>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
diff --git a/rannak/mangud/perenaine/memori/img/pesu.svg b/rannak/mangud/perenaine/memori/img/pesu.svg
index 6d38faa..2c27fe6 100644
--- a/rannak/mangud/perenaine/memori/img/pesu.svg
+++ b/rannak/mangud/perenaine/memori/img/pesu.svg
@@ -1,16 +1,35 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, 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 511.908 511.908" style="enable-background:new 0 0 511.908 511.908;" xml:space="preserve">
+ viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
<g>
+ <path style="fill:#9AA1A5;" d="M512,185.378H0v-52.966c0-9.754,7.901-17.655,17.655-17.655h476.69
+ c9.754,0,17.655,7.901,17.655,17.655V185.378z"/>
+ <path style="fill:#ECF0F1;" d="M507.763,276.234L308.966,397.242H203.034L4.237,276.234C1.607,274.636,0,271.776,0,268.695V185.38
+ h512v83.315C512,271.776,510.393,274.636,507.763,276.234"/>
<g>
- <path d="M511.794,307.954l-32.427-229.44c-0.747-5.227-5.227-9.173-10.56-9.173H43.313c-5.333,0-9.813,3.947-10.56,9.173
- L0.113,308.061c-0.853,5.867,3.2,11.2,9.067,12.053c161.707,22.72,189.867,111.147,190.933,114.773
- c1.28,4.587,5.44,7.68,10.24,7.68h91.2c4.693,0,8.853-3.093,10.24-7.68c1.067-3.733,29.333-92.16,190.933-114.88
- C508.594,319.154,512.647,313.821,511.794,307.954z M52.593,90.674h406.933l4.587,32H48.007L52.593,90.674z M22.833,300.595
- l22.08-156.587h148.48l-65.387,189.547C101.127,319.688,66.673,307.741,22.833,300.595z M294.3,421.341h-76.373
- c-6.4-14.827-25.067-48.107-71.04-76.907l69.12-200.427h80l69.227,200.427C319.367,373.234,300.7,406.514,294.3,421.341z
- M384.113,333.874l-65.6-189.867h148.693l22.293,156.8C445.447,307.954,410.993,320.008,384.113,333.874z"/>
+ <path style="fill:#BDC3C7;" d="M2.372,275.098l200.227,121.882c0.185-2.851,0.433-5.676,0.433-8.572
+ c0-73.128-59.277-132.414-132.414-132.414C45.618,255.996,22.322,263.058,2.372,275.098"/>
+ <path style="fill:#BDC3C7;" d="M509.628,275.098L309.401,396.981c-0.185-2.851-0.433-5.676-0.433-8.572
+ c0-73.128,59.277-132.414,132.414-132.414C466.382,255.996,489.678,263.058,509.628,275.098"/>
+ </g>
+ <path style="fill:#9AA1A5;" d="M308.966,397.241c-0.185-2.842,0-5.932,0-8.828c0-15.501,2.798-30.314,7.698-44.138H195.337
+ c4.899,13.824,7.698,28.637,7.698,44.138c0,2.895,0.185,5.985,0,8.828H308.966z"/>
+ <g>
+ <path style="fill:#ECF0F1;" d="M150.069,158.896H61.793c-4.882,0-8.828-3.946-8.828-8.828s3.946-8.828,8.828-8.828h88.276
+ c4.882,0,8.828,3.946,8.828,8.828S154.951,158.896,150.069,158.896"/>
+ <path style="fill:#ECF0F1;" d="M300.138,158.896h-88.276c-4.882,0-8.828-3.946-8.828-8.828s3.946-8.828,8.828-8.828h88.276
+ c4.882,0,8.828,3.946,8.828,8.828S305.02,158.896,300.138,158.896"/>
+ <path style="fill:#ECF0F1;" d="M450.207,158.896h-88.276c-4.882,0-8.828-3.946-8.828-8.828s3.946-8.828,8.828-8.828h88.276
+ c4.882,0,8.828,3.946,8.828,8.828S455.089,158.896,450.207,158.896"/>
+ </g>
+ <g>
+ <path style="fill:#9AA1A5;" d="M291.31,264.827H220.69c-4.882,0-8.828-3.946-8.828-8.828s3.946-8.828,8.828-8.828h70.621
+ c4.882,0,8.828,3.946,8.828,8.828S296.192,264.827,291.31,264.827"/>
+ <path style="fill:#9AA1A5;" d="M273.655,238.344h-35.31c-4.882,0-8.828-3.946-8.828-8.828s3.946-8.828,8.828-8.828h35.31
+ c4.882,0,8.828,3.946,8.828,8.828S278.537,238.344,273.655,238.344"/>
+ <path style="fill:#9AA1A5;" d="M273.655,291.309h-35.31c-4.882,0-8.828-3.946-8.828-8.828s3.946-8.828,8.828-8.828h35.31
+ c4.882,0,8.828,3.946,8.828,8.828S278.537,291.309,273.655,291.309"/>
</g>
</g>
<g>
diff --git a/rannak/mangud/perenaine/memori/img/pesu.svg.bak b/rannak/mangud/perenaine/memori/img/pesu.svg.bak
new file mode 100644
index 0000000..6d38faa
--- /dev/null
+++ b/rannak/mangud/perenaine/memori/img/pesu.svg.bak
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, 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 511.908 511.908" style="enable-background:new 0 0 511.908 511.908;" xml:space="preserve">
+<g>
+ <g>
+ <path d="M511.794,307.954l-32.427-229.44c-0.747-5.227-5.227-9.173-10.56-9.173H43.313c-5.333,0-9.813,3.947-10.56,9.173
+ L0.113,308.061c-0.853,5.867,3.2,11.2,9.067,12.053c161.707,22.72,189.867,111.147,190.933,114.773
+ c1.28,4.587,5.44,7.68,10.24,7.68h91.2c4.693,0,8.853-3.093,10.24-7.68c1.067-3.733,29.333-92.16,190.933-114.88
+ C508.594,319.154,512.647,313.821,511.794,307.954z M52.593,90.674h406.933l4.587,32H48.007L52.593,90.674z M22.833,300.595
+ l22.08-156.587h148.48l-65.387,189.547C101.127,319.688,66.673,307.741,22.833,300.595z M294.3,421.341h-76.373
+ c-6.4-14.827-25.067-48.107-71.04-76.907l69.12-200.427h80l69.227,200.427C319.367,373.234,300.7,406.514,294.3,421.341z
+ M384.113,333.874l-65.6-189.867h148.693l22.293,156.8C445.447,307.954,410.993,320.008,384.113,333.874z"/>
+ </g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
diff --git a/rannak/mangud/perenaine/memori/img/suhkur.svg b/rannak/mangud/perenaine/memori/img/suhkur.svg
index a82c743..58d4846 100644
--- a/rannak/mangud/perenaine/memori/img/suhkur.svg
+++ b/rannak/mangud/perenaine/memori/img/suhkur.svg
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, 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 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<g>
- <g>
- <path d="M511.492,288.022c-1.055-4.082-3.69-7.576-7.322-9.715l-144.826-85.284V17.37c0-8.778-7.117-15.895-15.895-15.895H108.304
- c-8.778,0-15.895,7.117-15.895,15.895v219.748H15.895C7.117,237.118,0,244.235,0,253.013v235.145
- c0,8.778,7.117,15.895,15.895,15.895H251.04c8.778,0,15.895-7.117,15.895-15.895v-39.771l101.784,59.938
- c2.533,1.491,5.31,2.2,8.051,2.2c5.445,0,10.748-2.801,13.711-7.832l119.321-202.624
- C511.941,296.437,512.549,292.103,511.492,288.022z M235.145,472.264H31.79V268.908h203.355V472.264z M237.382,236.619H124.199
- V33.265h203.355v141.038l-26.009-15.316c-3.634-2.139-7.967-2.748-12.047-1.691c-4.082,1.055-7.576,3.69-9.715,7.322
- L237.382,236.619z M371.153,472.867l-104.219-61.372V253.013h0.001c0-1.141-0.126-2.253-0.355-3.326l32.529-55.24l175.232,103.189
- L371.153,472.867z"/>
- </g>
-</g>
+ viewBox="0 0 511.999 511.999" style="enable-background:new 0 0 511.999 511.999;" xml:space="preserve">
+<path style="fill:#A1A1A1;" d="M101.769,7.779h234.347c6.798,0,12.309,5.511,12.309,12.309v234.347
+ c0,6.798-5.511,12.309-12.309,12.309H101.769c-6.798,0-12.309-5.511-12.309-12.309V20.088C89.461,13.29,94.971,7.779,101.769,7.779z
+ "/>
+<path style="fill:#D6D6D6;" d="M101.769,7.779h113.613v258.965H101.769c-6.798,0-12.309-5.511-12.309-12.309V20.088
+ C89.461,13.29,94.971,7.779,101.769,7.779z"/>
+<path style="fill:#A9A9A9;" d="M303.999,160.455l201.935,118.914c5.858,3.449,7.81,10.994,4.361,16.852L391.381,498.155
+ c-3.449,5.858-10.994,7.81-16.852,4.361L172.595,383.602c-5.858-3.449-7.81-10.994-4.361-16.852l118.914-201.935
+ C290.597,158.957,298.142,157.004,303.999,160.455z"/>
+<path style="fill:#BEBEBE;" d="M12.309,242.674h234.347c6.798,0,12.309,5.511,12.309,12.309V489.33
+ c0,6.798-5.511,12.309-12.309,12.309H12.309C5.511,501.639,0,496.128,0,489.33V254.983C0,248.185,5.511,242.674,12.309,242.674z"/>
+<path style="fill:#E9E9E9;" d="M12.309,242.674h203.072v258.965H12.309C5.511,501.639,0,496.128,0,489.33V254.983
+ C0,248.185,5.511,242.674,12.309,242.674z"/>
<g>
</g>
<g>
diff --git a/rannak/mangud/perenaine/memori/img/suhkur.svg.bak b/rannak/mangud/perenaine/memori/img/suhkur.svg.bak
new file mode 100644
index 0000000..a82c743
--- /dev/null
+++ b/rannak/mangud/perenaine/memori/img/suhkur.svg.bak
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, 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 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<g>
+ <g>
+ <path d="M511.492,288.022c-1.055-4.082-3.69-7.576-7.322-9.715l-144.826-85.284V17.37c0-8.778-7.117-15.895-15.895-15.895H108.304
+ c-8.778,0-15.895,7.117-15.895,15.895v219.748H15.895C7.117,237.118,0,244.235,0,253.013v235.145
+ c0,8.778,7.117,15.895,15.895,15.895H251.04c8.778,0,15.895-7.117,15.895-15.895v-39.771l101.784,59.938
+ c2.533,1.491,5.31,2.2,8.051,2.2c5.445,0,10.748-2.801,13.711-7.832l119.321-202.624
+ C511.941,296.437,512.549,292.103,511.492,288.022z M235.145,472.264H31.79V268.908h203.355V472.264z M237.382,236.619H124.199
+ V33.265h203.355v141.038l-26.009-15.316c-3.634-2.139-7.967-2.748-12.047-1.691c-4.082,1.055-7.576,3.69-9.715,7.322
+ L237.382,236.619z M371.153,472.867l-104.219-61.372V253.013h0.001c0-1.141-0.126-2.253-0.355-3.326l32.529-55.24l175.232,103.189
+ L371.153,472.867z"/>
+ </g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
diff --git a/rannak/mangud/perenaine/memori/img/taga.svg b/rannak/mangud/perenaine/memori/img/taga.svg
index a81a7dc..e7be8cb 100644
--- a/rannak/mangud/perenaine/memori/img/taga.svg
+++ b/rannak/mangud/perenaine/memori/img/taga.svg
@@ -1,62 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, 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 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path style="fill:#2E9ADA;" d="M328.91,183.912c-6.629-6.186-8.073-16.146-3.476-23.96c11.272-19.161,14.105-42.228,7.75-63.661
- c-6.328-21.355,22.217-31.067,42.494-31.067c37.807,0,68.564,30.758,68.564,68.564C444.241,193.776,372.41,224.505,328.91,183.912z"
- />
-<path style="fill:#60BFE1;" d="M67.762,133.787c0-37.807,30.758-68.564,68.564-68.564c20.198,0,48.841,9.644,42.494,31.067
- c-6.352,21.42-3.53,44.489,7.75,63.661c4.597,7.816,3.152,17.774-3.476,23.96C139.591,224.506,67.762,193.773,67.762,133.787z"/>
-<path style="fill:#FFEAB2;" d="M256.001,238.425c-83.084,0-140.536-83.146-111.833-160.572c2.814-7.588,10.051-12.625,18.144-12.625
- h187.376c8.093,0,15.332,5.037,18.145,12.625C396.606,155.464,338.912,238.425,256.001,238.425z"/>
-<path style="fill:#FFE08C;" d="M367.834,77.853c-2.814-7.588-10.051-12.625-18.145-12.625h-93.688v173.197
- C339.085,238.425,396.538,155.279,367.834,77.853z"/>
-<path style="fill:#60BFE1;" d="M414.233,512H97.77c-10.687,0-19.352-8.664-19.352-19.352v-61.376
- c0-97.919,79.663-177.583,177.583-177.583s177.583,79.663,177.583,177.583v61.376C433.584,503.336,424.92,512,414.233,512z"/>
-<path style="fill:#2E9ADA;" d="M256.001,253.69V512h158.231c10.687,0,19.352-8.664,19.352-19.352v-61.376
- C433.584,333.353,353.921,253.69,256.001,253.69z"/>
-<path style="fill:#C7E5F4;" d="M459.93,65.228h-97.621C342.185,25.72,301.04,0,256.001,0s-86.183,25.72-106.306,65.228H52.071
- c-10.687,0-19.352,8.664-19.352,19.352s8.664,19.352,19.352,19.352h110.24h187.376h110.24c10.687,0,19.352-8.664,19.352-19.352
- S470.617,65.228,459.93,65.228z"/>
-<path style="fill:#FFEAB2;" d="M256.001,402.196c42.046,0,76.252-34.207,76.252-76.252v-55.028
- c-23.118-11.037-48.975-17.226-76.252-17.226c-27.277,0-53.136,6.189-76.252,17.226v55.028
- C179.749,367.99,213.956,402.196,256.001,402.196z"/>
-<path style="fill:#C7E5F4;" d="M156.137,455.927c10.687,0,19.352-8.664,19.352-19.352s-8.664-19.352-19.352-19.352H78.973
- c-0.365,4.637-0.555,9.321-0.555,14.049v24.654H156.137z"/>
-<path style="fill:#60BFE1;" d="M459.93,65.228h-97.621C342.185,25.72,301.04,0,256.001,0v103.931h93.688h110.24
- c10.687,0,19.352-8.664,19.352-19.352S470.617,65.228,459.93,65.228z"/>
-<path style="fill:#FFE08C;" d="M256.001,253.69v148.506c42.046,0,76.252-34.207,76.252-76.252v-55.028
- C309.136,259.879,283.279,253.69,256.001,253.69z"/>
-<path style="fill:#60BFE1;" d="M336.514,436.575c0,10.687,8.664,19.352,19.352,19.352h77.719v-24.654
- c0-4.728-0.191-9.413-0.555-14.049h-77.164C345.177,417.223,336.514,425.888,336.514,436.575z"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
+<svg width="36px" height="36px" viewBox="0 0 36 36" version="1.1" preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>center-text-line</title>
+ <path d="M30.88,8H5.12a1.1,1.1,0,0,0,0,2.2H30.88a1.1,1.1,0,1,0,0-2.2Z" class="clr-i-outline clr-i-outline-path-1"></path><path d="M25.5,16.2a1.1,1.1,0,1,0,0-2.2h-15a1.1,1.1,0,1,0,0,2.2Z" class="clr-i-outline clr-i-outline-path-2"></path><path d="M30.25,20H5.75a1.1,1.1,0,0,0,0,2.2h24.5a1.1,1.1,0,0,0,0-2.2Z" class="clr-i-outline clr-i-outline-path-3"></path><path d="M24.88,26H11.12a1.1,1.1,0,1,0,0,2.2H24.88a1.1,1.1,0,1,0,0-2.2Z" class="clr-i-outline clr-i-outline-path-4"></path>
+ <rect x="0" y="0" width="36" height="36" fill-opacity="0"/>
+</svg> \ No newline at end of file
diff --git a/rannak/mangud/perenaine/memori/index.html b/rannak/mangud/perenaine/memori/index.html
index c19c7d5..6c470c3 100644
--- a/rannak/mangud/perenaine/memori/index.html
+++ b/rannak/mangud/perenaine/memori/index.html
@@ -14,118 +14,138 @@
<div class="left">
<div class="left-text">
<h1>Memori</h1>
- <p>Mängu läbimiseks leia üles kõik kümme paari</p>
+ <p>Mängu läbimiseks leia üles kõik kümme Talongipaari</p>
</div>
</div>
<section class="memory-game">
- <div class="memory-card" data-framework="butter">
- <img class="front-face" src="img/butter.svg" alt="Butter" />
+ <div class="memory-card" data-framework="või">
+ <img class="front-face"src="img/butter.svg" alt="või" />
+ <span class="talong-text">Või</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
- <div class="memory-card" data-framework="butter">
- <img class="front-face" src="img/butter.svg" alt="Butter" />
+ <div class="memory-card" data-framework="või">
+ <img class="front-face" src="img/butter.svg" alt="või" />
+ <span class="talong-text">Või</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
<div class="memory-card" data-framework="tikud">
<img class="front-face" src="img/tikud.svg" alt="tikud" />
+ <span class="talong-text">Tikud</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
<div class="memory-card" data-framework="tikud">
<img class="front-face" src="img/tikud.svg" alt="Tikud" />
+ <span class="talong-text">Tikud</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
<div class="memory-card" data-framework="alko">
<img class="front-face" src="img/alko.svg" alt="Alko" />
+ <span class="talong-text">Õlu</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
<div class="memory-card" data-framework="alko">
<img class="front-face" src="img/alko.svg" alt="Alko" />
+ <span class="talong-text">Õlu</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
<div class="memory-card" data-framework="jahu">
<img class="front-face" src="img/jahu.svg" alt="Jahu" />
+ <span class="talong-text">Jahu</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
<div class="memory-card" data-framework="jahu">
<img class="front-face" src="img/jahu.svg" alt="Jahu" />
+ <span class="talong-text">Jahu</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
<div class="memory-card" data-framework="pasta">
<img class="front-face" src="img/pasta.svg" alt="Pasta" />
+ <span class="talong-text">Pasta</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
<div class="memory-card" data-framework="pasta">
<img class="front-face" src="img/pasta.svg" alt="Pasta" />
+ <span class="talong-text">Pasta</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
<div class="memory-card" data-framework="pesu">
<img class="front-face" src="img/pesu.svg" alt="Pesu" />
+ <span class="talong-text">Pesu</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
<div class="memory-card" data-framework="pesu">
<img class="front-face" src="img/pesu.svg" alt="Pesu" />
+ <span class="talong-text">Pesu</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
<div class="memory-card" data-framework="riis">
<img class="front-face" src="img/riis.svg" alt="Riis" />
+ <span class="talong-text">Riis</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
<div class="memory-card" data-framework="riis">
<img class="front-face" src="img/riis.svg" alt="Riis" />
+ <span class="talong-text">Riis</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
<div class="memory-card" data-framework="sokid">
<img class="front-face" src="img/sokid.svg" alt="Sokid" />
+ <span class="talong-text">Sokid</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
<div class="memory-card" data-framework="sokid">
<img class="front-face" src="img/sokid.svg" alt="sokid" />
+ <span class="talong-text">Sokid</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
<div class="memory-card" data-framework="sool">
<img class="front-face" src="img/sool.svg" alt="Sool" />
+ <span class="talong-text">Sool</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
<div class="memory-card" data-framework="sool">
<img class="front-face" src="img/sool.svg" alt="Sool" />
+ <span class="talong-text">Sool</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
<div class="memory-card" data-framework="suhkur">
<img class="front-face" src="img/suhkur.svg" alt="suhkur" />
+ <span class="talong-text">Suhkur</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
<div class="memory-card" data-framework="suhkur">
<img class="front-face" src="img/suhkur.svg" alt="suhkur" />
+ <span class="talong-text">Suhkur</span>
<img class="back-face" src="img/taga.svg" alt="taga" />
</div>
diff --git a/rannak/mangud/perenaine/memori/script.js b/rannak/mangud/perenaine/memori/script.js
index 1a06fd9..bcdba13 100644
--- a/rannak/mangud/perenaine/memori/script.js
+++ b/rannak/mangud/perenaine/memori/script.js
@@ -11,6 +11,7 @@ function flipCard() {
this.classList.add('flip');
+
if (!hasFlippedCard) {
hasFlippedCard = true;
firstCard = this;
diff --git a/rannak/mangud/perenaine/memori/style.css b/rannak/mangud/perenaine/memori/style.css
index 600f91d..99f803b 100644
--- a/rannak/mangud/perenaine/memori/style.css
+++ b/rannak/mangud/perenaine/memori/style.css
@@ -7,7 +7,7 @@
body {
height: 100vh;
display: flex;
- background: #284F8F !important;
+ background: #eeee90 !important;
}
.memory-game {
@@ -46,14 +46,25 @@ body {
padding: 20px;
position: absolute;
border-radius: 5px;
- background: #F1F5FF;
+ background: #bcf5bc;
backface-visibility: hidden;
}
+
.front-face {
transform: rotateY(180deg);
}
+.talong-text{
+ font-weight: bold;
+ position: absolute;
+ top: 85%;
+ left: 50%;
+ transform: translate(-50%, -50%) rotateY(180deg);
+ text-align: center
+}
+
+
/* Side stuff */
.left, .right{
diff --git a/rannak/mangud/perenaine/ristsona/index.html b/rannak/mangud/perenaine/ristsona/index.html
index 9089c33..a1f2c7e 100644
--- a/rannak/mangud/perenaine/ristsona/index.html
+++ b/rannak/mangud/perenaine/ristsona/index.html
@@ -14,7 +14,11 @@
<div class="container text-white text-center">
<h1>Ristsõna</h1>
- <p>Lahenda ristsõna, vastuseks tuleb retsept?</p>
+
+ <p>Lahenda ristsõna, mille lahenduse
+ retsepti koostiosad on vastused
+ küsimustele (vist eks?)
+ </p>
<div class="text-center">
@@ -23,12 +27,20 @@
</div>
<div class="text-center inputBox">
+
<label for="quantity">Nr:</label>
- <input type="number" id="number" name="number" placeholder="1" min="1" max="12">
+ <input type="number" id="inputNr" name="number" min="1" max="12">
<input type="text" placeholder="Vastus " id="inputId">
<button type="button" onclick="getInputValue();">Proovi</button>
+
+ <div class="messageBox">
+ siia tuleb info
+ </div>
+
</div>
+
+
</div>
</div>
diff --git a/rannak/mangud/perenaine/ristsona/script.js b/rannak/mangud/perenaine/ristsona/script.js
index 01f4ad5..e09f847 100644
--- a/rannak/mangud/perenaine/ristsona/script.js
+++ b/rannak/mangud/perenaine/ristsona/script.js
@@ -1,12 +1,274 @@
-console.log("Brrrr");;
+//TODO delete arr not good and also undefined passing into õigeVastus ja valeVastus funks
let counter = 0;
+let õiged = new Array();
+
+
+function message(msg, color){
+ messageBox = document.querySelector(".messageBox");
+ messageBox.innerHTML = msg;
+ messageBox.style.color = color;
+}
+
+
+function õigeVastus(vastus, nr){
+ message("Õige!", "green");
+ console.log(nr);
+
+ let tähed = document.querySelectorAll("."+vastus);
+ for (let i = 0; i < tähed.length; i++) {
+ if (i == 0)
+ tähed[i].childNodes[1].style.display = "inline";
+ else
+ tähed[i].childNodes[0].style.display = "inline";
+ }
+
+ if (!õiged.includes(nr)) {
+ õiged.push(nr);
+ counter++;
+ }
+ console.log(counter);
+ console.log(õiged);
+ if (counter >= 12)
+ moveOnEnable();
+}
+
+
+function valeVastus(vastus, nr){
+ message("Vale pakumine, proovi uuesti", "red");
+
+ if (õiged.includes(nr)) {
+ delete õiged[õiged.indexOf(nr)];
+ counter--;
+ console.log(counter)
+ }
+
+}
+
+function kontrolliVastus(nr, vastus){
+ nr += ''; // dont know, andis errorit
+ console.log(nr);
+
+ switch (nr) {
+ case "1":
+ if (vastus == "kurk") õigeVastus(vastus, nr);
+ else{
+ let tähed = document.querySelectorAll(".kurk");
+ for (let i = 0; i < tähed.length; i++) {
+ if (i == 0)
+ tähed[i].childNodes[1].style.display = "none";
+ else
+ tähed[i].childNodes[0].style.display = "none";
+ }
+
+ valeVastus(vastus, nr);
+ }
+ break;
+
+
+ case "2":
+ if (vastus == "majonees") õigeVastus(vastus);
+ else {
+ let tähed = document.querySelectorAll(".majonees");
+ for (let i = 0; i < tähed.length; i++) {
+ if (i == 0)
+ tähed[i].childNodes[1].style.display = "none";
+ else
+ tähed[i].childNodes[0].style.display = "none";
+ }
+
+ valeVastus(vastus, nr);
+
+ }
+ break;
+
+ case "3":
+ if (vastus == "porgand") õigeVastus(vastus);
+ else {
+ let tähed = document.querySelectorAll(".porgand");
+ for (let i = 0; i < tähed.length; i++) {
+ if (i == 0)
+ tähed[i].childNodes[1].style.display = "none";
+ else
+ tähed[i].childNodes[0].style.display = "none";
+ }
+
+ valeVastus(vastus, nr);
+
+ }
+ break;
+
+ case "4":
+ if (vastus == "vorst") õigeVastus(vastus);
+ else {
+ let tähed = document.querySelectorAll(".vorst");
+ for (let i = 0; i < tähed.length; i++) {
+ if (i == 0)
+ tähed[i].childNodes[1].style.display = "none";
+ else
+ tähed[i].childNodes[0].style.display = "none";
+ }
+
+ valeVastus(vastus, nr);
+
+ }
+ break;
+
+ case "5":
+ if (vastus == "õun") õigeVastus(vastus);
+ else {
+ let tähed = document.querySelectorAll(".õun");
+ for (let i = 0; i < tähed.length; i++) {
+ if (i == 0)
+ tähed[i].childNodes[1].style.display = "none";
+ else
+ tähed[i].childNodes[0].style.display = "none";
+ }
+
+ valeVastus(vastus, nr);
+
+ }
+ break;
+
+ case "6":
+ if (vastus == "sool") õigeVastus(vastus);
+ else {
+ let tähed = document.querySelectorAll(".sool");
+ for (let i = 0; i < tähed.length; i++) {
+ if (i == 0)
+ tähed[i].childNodes[1].style.display = "none";
+ else
+ tähed[i].childNodes[0].style.display = "none";
+ }
+
+ valeVastus(vastus, nr);
+
+ }
+ break;
+
+ case "7":
+ if (vastus == "pipar") õigeVastus(vastus);
+ else {
+ let tähed = document.querySelectorAll(".pipar");
+ for (let i = 0; i < tähed.length; i++) {
+ if (i == 0)
+ tähed[i].childNodes[1].style.display = "none";
+ else
+ tähed[i].childNodes[0].style.display = "none";
+ }
+
+ valeVastus(vastus, nr);
+
+ }
+ break;
+
+ case "8":
+ if (vastus == "hernes") õigeVastus(vastus);
+ else {
+ let tähed = document.querySelectorAll(".hernes");
+ for (let i = 0; i < tähed.length; i++) {
+ if (i == 0)
+ tähed[i].childNodes[1].style.display = "none";
+ else
+ tähed[i].childNodes[0].style.display = "none";
+ }
+
+ valeVastus(vastus, nr);
+
+ }
+ break;
+
+
+ case "9":
+ if (vastus == "muna") õigeVastus(vastus);
+ else {
+ let tähed = document.querySelectorAll(".muna");
+ for (let i = 0; i < tähed.length; i++) {
+ if (i == 0)
+ tähed[i].childNodes[1].style.display = "none";
+ else
+ tähed[i].childNodes[0].style.display = "none";
+ }
+
+ valeVastus(vastus, nr);
+
+ }
+ break;
+
+ case "10":
+ if (vastus == "sibul") õigeVastus(vastus);
+ else {
+ let tähed = document.querySelectorAll(".sibul");
+ for (let i = 0; i < tähed.length; i++) {
+ if (i == 0)
+ tähed[i].childNodes[1].style.display = "none";
+ else
+ tähed[i].childNodes[0].style.display = "none";
+ }
+
+ valeVastus(vastus, nr);
+
+ }
+ break;
+
+ case "11":
+ if (vastus == "hapukoor") õigeVastus(vastus);
+ else {
+ let tähed = document.querySelectorAll(".hapukoor");
+ for (let i = 0; i < tähed.length; i++) {
+ if (i == 0)
+ tähed[i].childNodes[1].style.display = "none";
+ else
+ tähed[i].childNodes[0].style.display = "none";
+ }
+
+ valeVastus(vastus, nr);
+
+ }
+ break;
+
+ case "12":
+ if (vastus == "kartul") õigeVastus(vastus);
+ else {
+ let tähed = document.querySelectorAll(".kartul");
+ for (let i = 0; i < tähed.length; i++) {
+ if (i == 0)
+ tähed[i].childNodes[1].style.display = "none";
+ else
+ tähed[i].childNodes[0].style.display = "none";
+ }
+
+ valeVastus(vastus, nr);
+
+ }
+ break;
+
+
+ default: message("Proovi uuesti", "red");
+ }
+
+}
+
+
+
+
+
function getInputValue() {
- // Selecting the input element and get its value
- let inputVal = document.getElementById("inputId").value;
- // Displaying the value
- alert(inputVal);
- }
+ // Selecting the input element and get its value
+ let inputVal = document.getElementById("inputId").value;
+ let inputNr = document.getElementById("inputNr").value;
+
+ console.log(inputVal);
+ console.log(inputNr);
+
+ if (inputNr == "" || inputVal == ""){
+ message("Palun täida mõlemad väljad", "red");
+ }
+ else{
+ kontrolliVastus(inputNr, inputVal.toLowerCase());
+ }
+}
+
// Button func
diff --git a/rannak/mangud/perenaine/ristsona/style.css b/rannak/mangud/perenaine/ristsona/style.css
index dab40f7..0bbded1 100644
--- a/rannak/mangud/perenaine/ristsona/style.css
+++ b/rannak/mangud/perenaine/ristsona/style.css
@@ -11,10 +11,14 @@ body{
margin-top: 10px !important;
}
-#number {
+#inputNr {
width: 3em !important;
}
+.messageBox{
+ color: #212121;
+}
+
/* Kusimusi */
@@ -23,7 +27,6 @@ body{
}
-
/* Main styles*/
.main{
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 23:00:32 +0000