summaryrefslogtreecommitdiff
path: root/rannak/mangud/perenaine
diff options
context:
space:
mode:
Diffstat (limited to 'rannak/mangud/perenaine')
-rw-r--r--rannak/mangud/perenaine/memori/img/jahu.svg.bak85
-rw-r--r--rannak/mangud/perenaine/memori/img/pesu.svg65
-rw-r--r--rannak/mangud/perenaine/memori/img/pesu.svg.bak46
-rw-r--r--rannak/mangud/perenaine/memori/img/pesupulber.svg63
-rw-r--r--rannak/mangud/perenaine/memori/img/riis.svg.bak (renamed from rannak/mangud/perenaine/memori/img/riis.svg)0
-rw-r--r--rannak/mangud/perenaine/memori/img/sokid.svg138
-rw-r--r--rannak/mangud/perenaine/memori/img/suhkur.svg.bak47
-rw-r--r--rannak/mangud/perenaine/memori/img/tang.svg73
-rw-r--r--rannak/mangud/perenaine/memori/img/wcpaber.svg75
-rw-r--r--rannak/mangud/perenaine/memori/index.html88
-rw-r--r--rannak/mangud/perenaine/ristsona/index.html21
-rw-r--r--rannak/mangud/perenaine/ristsona/script.js28
-rw-r--r--rannak/mangud/perenaine/ristsona/style.css12
13 files changed, 308 insertions, 433 deletions
diff --git a/rannak/mangud/perenaine/memori/img/jahu.svg.bak b/rannak/mangud/perenaine/memori/img/jahu.svg.bak
deleted file mode 100644
index 3ac729f..0000000
--- a/rannak/mangud/perenaine/memori/img/jahu.svg.bak
+++ /dev/null
@@ -1,85 +0,0 @@
-<?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
deleted file mode 100644
index 2c27fe6..0000000
--- a/rannak/mangud/perenaine/memori/img/pesu.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-<?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>
- <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 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>
-</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.bak b/rannak/mangud/perenaine/memori/img/pesu.svg.bak
deleted file mode 100644
index 6d38faa..0000000
--- a/rannak/mangud/perenaine/memori/img/pesu.svg.bak
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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/pesupulber.svg b/rannak/mangud/perenaine/memori/img/pesupulber.svg
new file mode 100644
index 0000000..b796327
--- /dev/null
+++ b/rannak/mangud/perenaine/memori/img/pesupulber.svg
@@ -0,0 +1,63 @@
+<?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.98 511.98" style="enable-background:new 0 0 511.98 511.98;" xml:space="preserve">
+<path style="fill:#F6BB42;" d="M405.313,511.98c-0.5,0-1.016-0.047-1.516-0.109l-298.317-42.999
+ c-4.828-0.703-8.578-4.578-9.093-9.438L53.388,55.123c-0.344-3.188,0.781-6.375,3.031-8.641L99.418,3.14
+ c2.016-2.015,4.734-3.14,7.578-3.14h340.986c5.891,0,10.672,4.765,10.672,10.655V458.31c0,2.812-1.125,5.515-3.094,7.515
+ l-42.67,42.999C410.875,510.855,408.141,511.98,405.313,511.98z"/>
+<path style="fill:#434A54;" d="M447.982,0H347.564l-45.779,45.779c-4.172,4.172-4.172,10.922,0,15.093
+ c2.078,2.078,106.966,3.125,109.684,3.125c2.734,0,5.469-1.047,7.547-3.125l39.639-39.639V10.655C458.654,4.764,453.872,0,447.982,0
+ z"/>
+<path style="fill:#F6BB42;" d="M371.813,507.246l31.984,4.625c0.5,0.062,1.016,0.109,1.516,0.109c2.828,0,5.562-1.125,7.577-3.156
+ l42.67-42.999c1.969-2,3.094-4.703,3.094-7.515V10.655c0-2.938-1.203-5.609-3.125-7.546l-50.216,50.217L371.813,507.246z"/>
+<path style="fill:#FFCE54;" d="M405.313,42.654H63.997c-5.89,0-10.671,4.781-10.671,10.672v447.982
+ c0,5.891,4.781,10.672,10.671,10.672h341.316c5.891,0,10.671-4.781,10.671-10.672V53.326
+ C415.983,47.435,411.203,42.654,405.313,42.654z"/>
+<path style="fill:#E6E9ED;" d="M234.661,127.994c-64.701,0-117.339,52.623-117.339,117.324c0,64.7,52.639,117.323,117.339,117.323
+ c64.685,0,117.324-52.623,117.324-117.323C351.986,180.617,299.346,127.994,234.661,127.994z"/>
+<path style="fill:#5D9CEC;" d="M337.362,241.646l-21.125,7.344c-11.093,3.844-29.217,3.844-40.31,0l-21.125-7.344
+ c-11.078-3.844-29.217-3.844-40.295,0l-21.124,7.344c-11.078,3.844-29.217,3.844-40.311,0l-21.109-7.344
+ c-5.25-1.812-10.406-1.359-14.593,0.828c-0.031,0.953-0.047,1.891-0.047,2.844c0,64.7,52.639,117.323,117.339,117.323
+ c64.685,0,117.324-52.623,117.324-117.323c0-1.5-0.031-2.984-0.094-4.469C347.001,239.881,341.893,240.068,337.362,241.646z"/>
+<g>
+ <path style="fill:#CCD1D9;" d="M284.863,184.446c4.172,4.156,4.172,10.921,0,15.078c-4.172,4.171-10.921,4.171-15.077,0
+ c-4.172-4.156-4.172-10.921,0-15.078C273.943,180.274,280.691,180.274,284.863,184.446z"/>
+ <path style="fill:#CCD1D9;" d="M231.536,163.103c4.156,4.171,4.156,10.921,0,15.093c-4.171,4.156-10.921,4.156-15.093,0
+ c-4.156-4.172-4.156-10.921,0-15.093C220.616,158.947,227.366,158.947,231.536,163.103z"/>
+ <path style="fill:#CCD1D9;" d="M199.538,205.773c4.156,4.172,4.156,10.922,0,15.094c-4.171,4.156-10.921,4.156-15.093,0
+ c-4.156-4.172-4.156-10.922,0-15.094C188.617,201.616,195.367,201.616,199.538,205.773z"/>
+</g>
+<path style="fill:#434A54;" d="M309.315,425.764H159.993c-5.891,0-10.672-4.78-10.672-10.671s4.781-10.672,10.672-10.672h149.322
+ c5.89,0,10.671,4.781,10.671,10.672S315.206,425.764,309.315,425.764z"/>
+<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/riis.svg b/rannak/mangud/perenaine/memori/img/riis.svg.bak
index 8376e61..8376e61 100644
--- a/rannak/mangud/perenaine/memori/img/riis.svg
+++ b/rannak/mangud/perenaine/memori/img/riis.svg.bak
diff --git a/rannak/mangud/perenaine/memori/img/sokid.svg b/rannak/mangud/perenaine/memori/img/sokid.svg
deleted file mode 100644
index 4d3eb3d..0000000
--- a/rannak/mangud/perenaine/memori/img/sokid.svg
+++ /dev/null
@@ -1,138 +0,0 @@
-<?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.001 512.001" style="enable-background:new 0 0 512.001 512.001;" xml:space="preserve">
-<g>
- <path style="fill:#F2962E;" d="M170.281,7.604v227.997l-98.355,40.74c-44.285,18.344-65.315,69.115-46.972,113.4
- c18.344,44.285,69.115,65.315,113.4,46.971l30.069-12.455c-2.816-36.432,17.748-72.12,53.338-86.863l98.355-40.74V68.659h23.749
- V7.604H170.281z"/>
- <path style="fill:#F2962E;" d="M320.117,68.659v227.997l-98.355,40.74c-44.285,18.344-65.315,69.115-46.972,113.4
- c18.344,44.285,69.115,65.315,113.4,46.971l151.408-62.715c4.293-1.747,8.424-3.81,12.342-6.193
- c9.55-5.778,17.654-13.227,24.128-21.784c0.16-0.211,0.326-0.418,0.486-0.631c0.529-0.713,1.035-1.44,1.541-2.168
- c0.327-0.467,0.661-0.931,0.978-1.406c0.32-0.481,0.625-0.972,0.935-1.459c0.477-0.743,0.952-1.485,1.406-2.244
- c0.136-0.228,0.263-0.461,0.397-0.69c5.427-9.254,9.207-19.591,10.891-30.624c0.703-4.535,1.028-9.144,0.999-13.782V68.659H320.117
- z"/>
-</g>
-<path style="fill:#249189;" d="M451.94,428.858c9.55-5.778,17.654-13.228,24.128-21.784c0.16-0.212,0.326-0.418,0.486-0.631
- c0.529-0.713,1.035-1.44,1.541-2.168c0.327-0.467,0.661-0.931,0.978-1.406c0.32-0.481,0.625-0.972,0.935-1.459
- c0.477-0.743,0.952-1.485,1.406-2.244c0.136-0.228,0.263-0.461,0.397-0.69c5.427-9.254,9.207-19.591,10.891-30.624
- c0.703-4.535,1.028-9.144,0.999-13.782v-55.41c-3.437-0.332-6.919-0.514-10.443-0.514c-59.315,0-107.399,48.084-107.399,107.399
- c0,18.318,4.598,35.559,12.684,50.651l51.054-21.147C443.892,433.304,448.023,431.241,451.94,428.858z"/>
-<path style="fill:#7EC3C1;" d="M409.834,422.689l-5.819-14.051l21.207-8.783c2.503-1.019,4.852-2.196,7.021-3.516
- c5.235-3.167,9.776-7.273,13.512-12.211c0.121-0.16,0.251-0.33,0.404-0.527c0.185-0.254,0.365-0.516,0.556-0.791l1.461-2.188
- c0.172-0.269,0.346-0.535,0.51-0.804l0.297-0.516c3.162-5.393,5.218-11.177,6.146-17.251c0.384-2.484,0.571-5.086,0.554-7.746
- V331.19h15.208v23.068c0.021,3.422-0.225,6.837-0.731,10.104c-1.217,7.969-3.918,15.569-8.025,22.574l-0.408,0.706
- c-0.245,0.402-0.504,0.807-0.763,1.211l-1.754,2.627c-0.287,0.413-0.559,0.803-0.837,1.183l-0.479,0.626
- c-4.914,6.496-10.887,11.892-17.763,16.052c-2.845,1.73-5.922,3.274-9.132,4.582L409.834,422.689z"/>
-<g>
- <path style="fill:#249189;" d="M320.117,296.655v-58.741c-50.095,6.191-89.497,46.876-93.712,97.558L320.117,296.655z"/>
- <path style="fill:#249189;" d="M24.955,389.74c18.344,44.285,69.115,65.315,113.4,46.971L71.927,276.34
- C27.641,294.684,6.611,345.455,24.955,389.74z"/>
- <path style="fill:#249189;" d="M221.762,337.395c-44.285,18.344-65.315,69.115-46.972,113.4
- c18.344,44.285,69.115,65.315,113.4,46.971L221.762,337.395z"/>
-</g>
-<path style="fill:#7A1B2E;" d="M351.47,61.055V0H162.677v230.52l-93.661,38.796c-23.295,9.649-41.439,27.792-51.087,51.087
- c-9.649,23.296-9.649,48.952,0,72.248c0.917,2.213,1.91,4.378,2.976,6.49c15.973,31.662,48.27,51.763,84.162,51.803
- c0.035,0,0.071,0.002,0.107,0.002c0.002,0,0.004,0,0.006,0c12.396,0,24.536-2.426,36.084-7.209l20.941-8.674
- c1.183,6.273,3.022,12.516,5.559,18.642c0.465,1.122,0.951,2.233,1.455,3.329c0.12,0.261,0.25,0.514,0.372,0.774
- c0.393,0.836,0.789,1.671,1.204,2.491c0.106,0.21,0.221,0.414,0.329,0.623c0.448,0.87,0.902,1.735,1.375,2.586
- c0.05,0.089,0.102,0.174,0.152,0.264c16.561,29.617,47.795,48.226,82.359,48.228c0.002,0,0.004,0,0.007,0
- c0.561,0,1.117-0.031,1.677-0.042c0.453-0.008,0.906-0.019,1.361-0.033c1.024-0.032,2.045-0.081,3.065-0.147
- c0.561-0.037,1.12-0.078,1.681-0.124c0.93-0.077,1.856-0.166,2.782-0.272c0.653-0.074,1.307-0.155,1.96-0.242
- c0.82-0.111,1.637-0.23,2.454-0.362c0.785-0.127,1.568-0.263,2.352-0.41c0.662-0.125,1.322-0.255,1.981-0.394
- c0.961-0.202,1.921-0.417,2.88-0.65c0.457-0.112,0.912-0.227,1.369-0.346c1.158-0.3,2.315-0.617,3.467-0.963
- c0.238-0.072,0.474-0.147,0.713-0.221c1.311-0.405,2.62-0.834,3.924-1.3c0.075-0.026,0.149-0.056,0.224-0.083
- c1.403-0.506,2.802-1.043,4.195-1.62l7.025-2.91l0,0l144.339-59.787c4.702-1.914,9.219-4.181,13.411-6.73
- c10.186-6.163,19.02-14.137,26.254-23.699l0.151-0.195c0.026-0.033,0.053-0.069,0.078-0.102c0.099-0.128,0.198-0.256,0.299-0.391
- c0.404-0.544,0.787-1.097,1.172-1.648c0.163-0.233,0.336-0.465,0.497-0.698l0.275-0.39c0.266-0.377,0.531-0.754,0.798-1.154
- c0.26-0.389,0.51-0.784,0.76-1.179l0.139-0.219l0.111-0.174c0.388-0.606,0.77-1.22,1.15-1.836c0.127-0.205,0.259-0.404,0.382-0.611
- c0.111-0.186,0.217-0.372,0.323-0.56l0.106-0.188c6.065-10.342,10.051-21.554,11.846-33.306c0.754-4.87,1.12-9.914,1.089-14.946
- v-62.315V61.055H351.47z M31.98,326.223c0.478-1.154,0.984-2.289,1.512-3.413c0.171-0.365,0.356-0.722,0.533-1.084
- c0.367-0.752,0.737-1.503,1.126-2.24c0.221-0.421,0.454-0.833,0.682-1.249c0.367-0.667,0.738-1.331,1.123-1.985
- c0.251-0.428,0.51-0.852,0.77-1.274c0.387-0.631,0.782-1.256,1.185-1.874c0.271-0.416,0.544-0.829,0.822-1.239
- c0.421-0.619,0.853-1.229,1.291-1.835c0.279-0.386,0.556-0.775,0.842-1.156c0.479-0.638,0.971-1.261,1.468-1.883
- c0.264-0.33,0.52-0.664,0.788-0.989c0.643-0.779,1.305-1.541,1.977-2.293c0.136-0.152,0.265-0.31,0.401-0.461
- c0.816-0.899,1.654-1.777,2.51-2.637c0.243-0.244,0.497-0.477,0.743-0.718c0.62-0.607,1.246-1.211,1.887-1.797
- c0.334-0.305,0.676-0.6,1.016-0.899c0.573-0.506,1.149-1.008,1.737-1.497c0.374-0.311,0.753-0.614,1.133-0.919
- c0.575-0.46,1.155-0.915,1.743-1.36c0.395-0.299,0.793-0.594,1.194-0.886c0.599-0.435,1.205-0.86,1.818-1.278
- c0.401-0.275,0.802-0.551,1.209-0.818c0.65-0.427,1.311-0.839,1.975-1.249c0.381-0.235,0.758-0.475,1.145-0.705
- c0.789-0.467,1.592-0.916,2.4-1.358c0.273-0.149,0.538-0.307,0.813-0.453c0.043-0.022,0.086-0.043,0.129-0.065l60.331,145.65
- c-0.036,0.011-0.072,0.024-0.108,0.035c-0.164,0.05-0.33,0.093-0.494,0.142c-0.96,0.287-1.924,0.555-2.893,0.804
- c-0.351,0.09-0.703,0.175-1.054,0.261c-0.835,0.203-1.674,0.392-2.514,0.568c-0.325,0.068-0.651,0.14-0.978,0.204
- c-1.143,0.223-2.287,0.428-3.438,0.599c-0.085,0.012-0.171,0.021-0.257,0.033c-1.068,0.156-2.139,0.286-3.214,0.397
- c-0.346,0.036-0.692,0.066-1.039,0.097c-0.859,0.078-1.72,0.141-2.581,0.191c-0.342,0.019-0.682,0.043-1.024,0.057
- c-1.168,0.052-2.338,0.086-3.512,0.086c-31.1-0.003-58.993-17.959-71.924-46.01c-0.44-0.955-0.865-1.919-1.27-2.897
- C23.885,367.29,23.885,345.764,31.98,326.223z M142.47,426.777L81.862,280.455l96.024-39.774V15.208h13.722v21.913h15.208V15.208
- h13.724v21.913h15.208V15.208h13.724v21.913h15.208V15.208h13.724v21.913h15.208V15.208h13.724v21.913h15.208V15.208h13.724v45.847
- h-23.752V231.42c-48.928,9.02-87.015,49.235-93.194,98.757l-0.466,0.194c-1.002,0.415-1.988,0.851-2.969,1.296
- c-0.252,0.115-0.505,0.231-0.756,0.348c-0.934,0.434-1.86,0.878-2.773,1.339c-0.109,0.055-0.217,0.112-0.325,0.167
- c-0.842,0.429-1.672,0.872-2.495,1.323c-0.325,0.178-0.649,0.358-0.971,0.539c-0.17,0.095-0.343,0.188-0.512,0.284
- c-0.487,0.278-0.965,0.565-1.445,0.851c-0.534,0.317-1.063,0.643-1.59,0.97c-0.339,0.211-0.681,0.419-1.017,0.634
- c-0.107,0.069-0.212,0.141-0.318,0.21c-0.506,0.326-1.009,0.658-1.508,0.994c-0.179,0.121-0.357,0.245-0.535,0.367
- c-26,17.744-41.672,47.483-41.063,79.587L142.47,426.777z M235.896,323.31c8.261-37.994,38.382-68.236,76.618-76.412v44.675
- L235.896,323.31z M274.885,445.774l-14.05,5.82l17.282,41.723c-0.001,0-0.002,0.001-0.003,0.001
- c-7.22,2.211-14.562,3.333-21.832,3.443c-0.004,0-0.008,0-0.011,0c-27.854,0.421-54.639-13.979-69.313-38.624
- c-0.066-0.112-0.129-0.226-0.195-0.338c-0.508-0.864-1-1.741-1.478-2.63c-0.156-0.29-0.309-0.582-0.462-0.875
- c-0.396-0.758-0.78-1.526-1.153-2.301c-0.146-0.303-0.295-0.604-0.438-0.909c-0.491-1.052-0.967-2.116-1.415-3.2
- c-0.508-1.226-0.979-2.457-1.42-3.692c-0.145-0.406-0.268-0.813-0.406-1.22c-0.283-0.832-0.566-1.666-0.819-2.501
- c-0.148-0.488-0.273-0.977-0.411-1.465c-0.214-0.758-0.43-1.517-0.62-2.277c-0.131-0.523-0.241-1.048-0.361-1.573
- c-0.166-0.729-0.334-1.457-0.479-2.187c-0.107-0.541-0.198-1.085-0.294-1.626c-0.126-0.715-0.251-1.429-0.358-2.143
- c-0.082-0.552-0.149-1.103-0.219-1.655c-0.089-0.708-0.176-1.414-0.246-2.122c-0.055-0.556-0.098-1.111-0.142-1.667
- c-0.055-0.704-0.103-1.406-0.139-2.109c-0.028-0.557-0.048-1.112-0.064-1.669c-0.02-0.701-0.032-1.401-0.034-2.101
- c-0.001-0.555,0.003-1.107,0.013-1.661c0.013-0.701,0.036-1.4,0.068-2.099c0.024-0.548,0.053-1.097,0.089-1.643
- c0.047-0.702,0.105-1.4,0.171-2.1c0.051-0.539,0.1-1.079,0.162-1.616c0.08-0.706,0.176-1.408,0.275-2.111
- c0.074-0.525,0.146-1.05,0.23-1.574c0.116-0.716,0.249-1.428,0.384-2.138c0.095-0.504,0.187-1.009,0.291-1.511
- c0.154-0.732,0.327-1.458,0.502-2.185c0.114-0.474,0.219-0.951,0.342-1.423c0.2-0.768,0.422-1.531,0.644-2.293
- c0.123-0.422,0.235-0.846,0.365-1.265c0.267-0.862,0.559-1.715,0.855-2.567c0.108-0.312,0.205-0.629,0.317-0.94
- c0.84-2.331,1.789-4.622,2.844-6.865c0.136-0.289,0.286-0.571,0.425-0.858c0.398-0.821,0.8-1.641,1.226-2.448
- c0.204-0.385,0.423-0.762,0.633-1.145c0.383-0.7,0.768-1.398,1.172-2.087c0.245-0.417,0.505-0.824,0.757-1.236
- c0.393-0.641,0.786-1.282,1.197-1.911c0.278-0.426,0.57-0.844,0.856-1.264c0.41-0.602,0.82-1.202,1.247-1.794
- c0.307-0.426,0.626-0.845,0.942-1.264c0.43-0.571,0.862-1.14,1.307-1.699c0.335-0.42,0.677-0.833,1.02-1.247
- c0.451-0.543,0.906-1.084,1.373-1.615c0.359-0.41,0.725-0.814,1.093-1.218c0.473-0.518,0.953-1.031,1.441-1.537
- c0.383-0.397,0.771-0.791,1.162-1.18c0.497-0.495,1.002-0.981,1.513-1.464c0.404-0.381,0.81-0.759,1.223-1.132
- c0.522-0.472,1.054-0.935,1.591-1.394c0.423-0.362,0.846-0.723,1.276-1.077c0.55-0.451,1.111-0.89,1.675-1.327
- c0.44-0.341,0.878-0.683,1.325-1.015c0.58-0.43,1.173-0.846,1.766-1.261c0.452-0.316,0.9-0.637,1.361-0.945
- c0.615-0.412,1.246-0.806,1.876-1.202c0.452-0.284,0.898-0.574,1.358-0.85c0.023-0.014,0.047-0.027,0.069-0.041
- c0.648-0.388,1.312-0.757,1.974-1.128c0.332-0.186,0.659-0.377,0.994-0.559c0.195-0.105,0.389-0.21,0.585-0.313l35.282,85.179
- l14.05-5.82l-35.426-85.525l96.024-39.774v-72.424V76.263h13.724v21.913h15.208V76.263h13.724v21.913h15.208V76.263h13.724v21.913
- h15.208V76.263h13.723v21.913h15.208V76.263h13.724v21.913h15.208V76.263h13.722v214.32c-0.953-0.024-1.9-0.037-2.839-0.037
- c-63.413,0-115.003,51.59-115.003,115.004c0,16.095,3.419,32.081,9.92,46.715l-85.869,35.568L274.885,445.774z M447.99,422.361
- c-3.516,2.137-7.304,4.037-11.301,5.665l-44.47,18.419c-5.742-12.791-8.755-26.797-8.755-40.897
- c0-55.027,44.768-99.796,99.795-99.796c0.937,0,1.884,0.014,2.839,0.043v48.324c0.013,2.137-0.057,4.263-0.209,6.365
- c-0.152,2.102-0.387,4.18-0.704,6.223c-0.216,1.412-0.48,2.812-0.771,4.204c-1.484,7.11-3.937,13.959-7.344,20.447
- c-0.581,1.105-1.189,2.2-1.824,3.284l-0.356,0.621c-0.414,0.69-0.848,1.366-1.292,2.057l-0.293,0.462
- c-0.08,0.128-0.16,0.248-0.24,0.374c-0.103,0.161-0.207,0.327-0.309,0.481c-0.1,0.151-0.206,0.298-0.31,0.447
- c-0.092,0.132-0.181,0.264-0.274,0.394l-0.172,0.246l-0.146,0.208c-0.293,0.421-0.59,0.833-0.886,1.248
- c-0.171,0.24-0.339,0.487-0.514,0.723l-0.448,0.582C463.937,410.507,456.535,417.191,447.99,422.361z"/>
-<rect x="455.681" y="133.323" style="fill:#FFC88F;" width="15.208" height="122.677"/>
-<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.bak b/rannak/mangud/perenaine/memori/img/suhkur.svg.bak
deleted file mode 100644
index a82c743..0000000
--- a/rannak/mangud/perenaine/memori/img/suhkur.svg.bak
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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/tang.svg b/rannak/mangud/perenaine/memori/img/tang.svg
new file mode 100644
index 0000000..ceac219
--- /dev/null
+++ b/rannak/mangud/perenaine/memori/img/tang.svg
@@ -0,0 +1,73 @@
+<?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:#916D42;" d="M255.568,8.605h195.153c11.811,0,21.387,9.631,21.387,21.513V405.97
+ c0,12.055-5.027,23.557-13.859,31.706l-91.605,62.019l-14.836,3.7h-96.24V8.605H255.568z"/>
+<path style="fill:#BC9A5E;" d="M470.873,22.908L376.46,88.347l-24.886,151.451H84.161L70.13,155.249H39.894v-42.533
+ C39.895,55.186,85.958,8.605,143.489,8.605h33.036h28.414h245.669C459.709,8.605,467.825,14.333,470.873,22.908L470.873,22.908z"/>
+<path style="fill:#CAA661;" d="M82.01,503.395c-23.268,0-42.307-19.091-42.114-42.425V122.183
+ C39.703,98.848,58.742,79.756,82.01,79.756h267.418c23.268,0,42.301,19.092,42.301,42.427V460.97
+ c0,23.335-19.032,42.425-42.301,42.425H82.01L82.01,503.395z"/>
+<path style="fill:#DDC98B;" d="M319.104,436.894H116.64c0-13.465,3.81-26.928,11.429-37.143l62.108-83.303
+ c15.231-20.429,40.158-20.429,55.389,0l62.114,83.303C315.291,409.966,319.104,423.43,319.104,436.894z"/>
+<path d="M479.051,20.25c-0.025-0.074-0.043-0.15-0.07-0.224c-0.013-0.034-0.028-0.067-0.041-0.101
+ c-0.232-0.645-0.488-1.279-0.763-1.904c-0.061-0.14-0.124-0.278-0.187-0.415c-0.289-0.634-0.594-1.26-0.925-1.868
+ c-0.009-0.015-0.017-0.03-0.026-0.045c-0.337-0.616-0.698-1.215-1.076-1.805c-0.055-0.086-0.109-0.172-0.165-0.258
+ c-0.397-0.607-0.814-1.199-1.253-1.775c-0.008-0.01-0.015-0.019-0.024-0.03c-5.054-6.616-12.774-11.068-21.535-11.73
+ c-0.01-0.001-0.019-0.001-0.03-0.002C452.22,0.038,451.474,0,450.721,0h-0.113h-195.04H143.49
+ c-30.103,0-58.328,11.728-79.478,33.023C42.91,54.27,31.289,82.573,31.289,112.716v19.16c0,0,0.001-0.001,0.001-0.002v329.025
+ c-0.112,13.569,5.116,26.376,14.72,36.058c9.622,9.7,22.406,15.043,36,15.043h173.558h93.859h2.379c0.552,0,1.1-0.069,1.641-0.174
+ c11.832-0.933,22.536-5.93,30.721-13.607l78.902-53.418c0.357-0.242,0.695-0.51,1.011-0.801
+ c10.568-9.751,16.629-23.612,16.629-38.03V30.118C480.712,26.662,480.122,23.343,479.051,20.25z M143.49,17.21h112.079h22.823h5.223
+ h166.994c3.248,0,6.296,1.226,8.615,3.303l-83.59,57.938c-7.661-4.631-16.627-7.299-26.205-7.299H82.01
+ c-9.893,0-19.351,2.843-27.479,8.122C68.042,43.061,102.812,17.21,143.49,17.21z M58.23,484.838
+ c-6.348-6.401-9.803-14.852-9.729-23.868V122.112c-0.073-8.946,3.383-17.398,9.73-23.799c6.365-6.417,14.809-9.952,23.779-9.952
+ h267.418c18.579,0,33.696,15.172,33.696,33.821v338.787c0,18.648-15.116,33.82-33.696,33.82H82.01
+ C73.04,494.79,64.596,491.255,58.23,484.838z M452.858,430.933l-52.855,35.784c0.212-1.888,0.331-3.803,0.331-5.748V122.183
+ c0-12.134-4.254-23.287-11.336-32.056l74.505-51.64V405.97C463.502,415.392,459.631,424.454,452.858,430.933z M314.578,394.608
+ l-62.114-83.303c-9.03-12.113-21.316-18.784-34.593-18.784c-13.277,0-25.562,6.671-34.592,18.784l-62.107,83.302
+ c-8.471,11.358-13.136,26.376-13.136,42.287c0,4.753,3.853,8.605,8.605,8.605h202.465c0.006,0,0.014,0,0.021,0
+ c4.752,0,8.605-3.852,8.605-8.605c0-0.218-0.008-0.435-0.024-0.649C327.582,420.58,322.931,405.817,314.578,394.608z
+ M125.829,428.289c1.231-8.895,4.368-17,9.137-23.394l62.108-83.303c5.702-7.648,13.087-11.86,20.795-11.86
+ c7.709,0,15.093,4.212,20.796,11.861l62.113,83.302c4.767,6.397,7.906,14.502,9.135,23.395H125.829V428.289z M208.574,231.194
+ c0-4.752,3.83-8.605,8.554-8.605h1.48c4.725,0,8.554,3.853,8.554,8.605s-3.83,8.605-8.554,8.605h-1.48
+ C212.405,239.799,208.574,235.946,208.574,231.194z M230.799,179.91c0-4.752,3.83-8.605,8.554-8.605h1.48
+ c4.725,0,8.554,3.853,8.554,8.605c0,4.752-3.83,8.605-8.554,8.605h-1.48C234.629,188.515,230.799,184.663,230.799,179.91z
+ M227.163,346.259c0,4.752-3.83,8.605-8.554,8.605h-1.48c-4.725,0-8.554-3.853-8.554-8.605s3.83-8.605,8.554-8.605h1.48
+ C223.334,337.654,227.163,341.507,227.163,346.259z M186.35,138.97c0-4.752,3.83-8.605,8.554-8.605h1.48
+ c4.725,0,8.554,3.853,8.554,8.605s-3.83,8.605-8.554,8.605h-1.48C190.18,147.575,186.35,143.723,186.35,138.97z M249.388,391.76
+ c0,4.752-3.83,8.605-8.554,8.605h-1.48c-4.725,0-8.554-3.853-8.554-8.605s3.83-8.605,8.554-8.605h1.48
+ C245.559,383.155,249.388,387.007,249.388,391.76z M204.939,391.76c0,4.752-3.83,8.605-8.554,8.605h-1.48
+ c-4.725,0-8.555-3.853-8.555-8.605s3.83-8.605,8.555-8.605h1.48C201.109,383.155,204.939,387.007,204.939,391.76z"/>
+<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/wcpaber.svg b/rannak/mangud/perenaine/memori/img/wcpaber.svg
new file mode 100644
index 0000000..dbfade1
--- /dev/null
+++ b/rannak/mangud/perenaine/memori/img/wcpaber.svg
@@ -0,0 +1,75 @@
+<?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:#B5E1F4;" d="M474.813,163.301c16.074,0,29.103,13.03,29.103,29.103l0,0c0,16.074-13.03,29.103-29.103,29.103
+ c16.074,0,29.103,13.03,29.103,29.103l0,0c0,16.074-13.03,29.103-29.103,29.103c16.074,0,29.103,13.03,29.103,29.103l0,0
+ c0,16.074-13.03,29.103-29.103,29.103c16.074,0,29.103,13.03,29.103,29.103l0,0c0,16.074-13.03,29.103-29.103,29.103H342.232V337.92
+ v-58.206v-58.206v-58.206v-58.206h132.581c16.074,0,29.103,13.03,29.103,29.103l0,0
+ C503.916,150.271,490.886,163.301,474.813,163.301z"/>
+<path style="fill:#A2CCDB;" d="M374.568,105.095H460.8l-43.116,291.032h-43.116V105.095z"/>
+<path style="fill:#C5EAFF;" d="M406.905,115.874v280.253c0,35.718-89.279,64.674-199.411,64.674S8.084,431.844,8.084,396.126
+ V115.874H406.905z"/>
+<path style="fill:#F4FFF9;" d="M406.905,115.874c0,35.718-89.279,64.674-199.411,64.674S8.084,151.592,8.084,115.874
+ S97.363,51.2,207.495,51.2S406.905,80.155,406.905,115.874z"/>
+<path style="fill:#D7F3FF;" d="M340.435,115.874c0,23.812-59.519,43.116-132.94,43.116s-132.94-19.304-132.94-43.116
+ s59.519-43.116,132.94-43.116S340.435,92.062,340.435,115.874z"/>
+<path style="fill:#A2CCDB;" d="M256,115.874c0,8.688-21.716,15.732-48.505,15.732s-48.505-7.043-48.505-15.732
+ s21.716-15.732,48.505-15.732S256,107.186,256,115.874z"/>
+<path d="M207.495,139.69c28.168,0,56.589-7.364,56.589-23.816s-28.422-23.816-56.589-23.816s-56.589,7.364-56.589,23.816
+ S179.327,139.69,207.495,139.69z M207.495,108.226c21.722,0,35.228,4.724,39.438,7.648c-4.21,2.923-17.716,7.648-39.438,7.648
+ s-35.228-4.724-39.438-7.648C172.267,112.95,185.773,108.226,207.495,108.226z M512,192.404c0-11.772-5.499-22.284-14.062-29.103
+ C506.501,156.482,512,145.97,512,134.198c0-20.505-16.683-37.187-37.187-37.187h-66.051c-9.275-13.422-28.795-25.161-57.768-34.558
+ c-38.448-12.469-89.41-19.336-143.499-19.336S102.444,49.983,63.997,62.452C22.129,76.031,0,94.504,0,115.874v280.253
+ c0,21.369,22.129,39.842,63.997,53.422c38.447,12.469,89.409,19.336,143.498,19.336s105.051-6.867,143.498-19.336
+ c36.491-11.834,57.987-27.388,62.907-45.337h60.913c20.505,0,37.187-16.683,37.187-37.187c0-11.772-5.499-22.284-14.062-29.103
+ c8.563-6.819,14.062-17.331,14.062-29.103s-5.499-22.284-14.062-29.103c8.563-6.819,14.062-17.331,14.062-29.103
+ c0-11.772-5.499-22.284-14.062-29.103C506.501,214.689,512,204.176,512,192.404z M68.984,77.833
+ c36.879-11.961,86.071-18.548,138.511-18.548s101.631,6.587,138.511,18.548c33.072,10.726,52.816,24.948,52.816,38.041
+ s-19.744,27.315-52.816,38.041c-36.879,11.961-86.071,18.548-138.511,18.548s-101.631-6.587-138.511-18.548
+ c-33.072-10.726-52.816-24.948-52.816-38.041S35.912,88.559,68.984,77.833z M474.813,171.385c11.59,0,21.019,9.429,21.019,21.019
+ s-9.429,21.019-21.019,21.019c-4.465,0-8.084,3.618-8.084,8.084c0,4.466,3.62,8.084,8.084,8.084c11.59,0,21.019,9.429,21.019,21.019
+ s-9.429,21.019-21.019,21.019c-4.465,0-8.084,3.618-8.084,8.084c0,4.466,3.62,8.084,8.084,8.084c11.59,0,21.019,9.429,21.019,21.019
+ s-9.429,21.019-21.019,21.019c-4.465,0-8.084,3.618-8.084,8.084s3.62,8.084,8.084,8.084c11.59,0,21.019,9.429,21.019,21.019
+ s-9.429,21.019-21.019,21.019h-59.823V353.01c0-4.466-3.62-8.084-8.084-8.084s-8.084,3.618-8.084,8.084v43.116
+ c0,13.093-19.744,27.315-52.816,38.041c-36.879,11.961-86.071,18.548-138.511,18.548s-101.631-6.587-138.511-18.548
+ c-33.072-10.726-52.816-24.948-52.816-38.041v-13.591c10.767,9.031,26.81,17.08,47.828,23.897
+ c38.447,12.469,89.409,19.336,143.498,19.336c4.465,0,8.084-3.618,8.084-8.084c0-4.466-3.62-8.084-8.084-8.084
+ c-52.44,0-101.631-6.587-138.511-18.548c-33.072-10.726-52.816-24.948-52.816-38.041v-13.678
+ c16.98,14.326,46.859,26.12,87.383,34.002c4.377,0.85,8.626-2.01,9.479-6.393c0.853-4.382-2.01-8.626-6.393-9.479
+ c-62.495-12.154-90.469-32.648-90.469-47.568V145.398c10.767,9.031,26.81,17.08,47.828,23.897
+ c38.447,12.469,89.409,19.336,143.498,19.336s105.051-6.867,143.498-19.336c21.018-6.817,37.061-14.866,47.828-23.897v175.275
+ c0,4.466,3.62,8.084,8.084,8.084s8.084-3.618,8.084-8.084v-204.8c0-0.904-0.04-1.801-0.119-2.695h59.942
+ c11.59,0,21.019,9.429,21.019,21.019s-9.429,21.019-21.019,21.019c-4.465,0-8.084,3.618-8.084,8.084
+ C466.728,167.767,470.348,171.385,474.813,171.385z"/>
+<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/index.html b/rannak/mangud/perenaine/memori/index.html
index 6b87fa3..240a48e 100644
--- a/rannak/mangud/perenaine/memori/index.html
+++ b/rannak/mangud/perenaine/memori/index.html
@@ -32,27 +32,21 @@
<div class="modal-content">
<div class="modal-header">
- <h5 class="modal-title" id="myModalLabel">Sissejuhatav info Memori Mängule</h5>
+ <h5 class="modal-title" id="myModalLabel">Sissejuhatus</h5>
<button type="button" class="closeModalButton" data-bs-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
- Odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo?
- Arcu non odio euismod lacinia at quis risus sed vulputate odio. Nullam non nisi est,
- sit amet facilisis magna etiam tempor, orci eu lobortis elementum,
- nibh tellus molestie nunc, non blandit massa enim nec dui nunc.
- <br/>
- Odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo?
- Arcu non odio euismod lacinia at quis risus sed vulputate odio. Nullam non nisi est,
- sit amet facilisis magna etiam tempor, orci eu lobortis elementum,
- nibh tellus molestie nunc, non blandit massa enim nec dui nunc.
- <br/>
- odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo?
- arcu non odio euismod lacinia at quis risus sed vulputate odio. nullam non nisi est,
- sit amet facilisis magna etiam tempor, orci eu lobortis elementum,
- nibh tellus molestie nunc, non blandit massa enim nec dui nunc.
+
+ No on alles aeg! Poelettidel valitseb selline tühjus, et tikutoosigi pole osta! <br/>
+ Talongimajandus leevendab olukorda niipalju, et nüüd on vähemalt VÕIMALUS midagi saada! Sest ega talong ju kaupa poes ei kindlusta. Kui kell 16 tööl lõpetan, lähen kohe järjekorda. <br/>
+ Kell 17 pannakse kaup välja. Kunagi ei tea, kas õnnestub midagi saada või lõpeb kaup enne otsa. <br/> <br/>
+ Talongide peal on kogu esmatarbe kaup: <br/>
+ <strong>või, nisujahu, tangained, makaronitooted, sool, suhkur, alkohol, tuletikud, wc paber, pesupulber. Nii tore oleks, kui saaks neid kõiki topelt! Talongimemoiin aitab!</strong>
+
+
</div>
</div>
@@ -79,95 +73,111 @@
<div class="memory-card" data-framework="tikud">
<img class="front-face" src="img/tikud.svg" alt="tikud" />
- <span class="talong-text">Tikud</span>
+ <span class="talong-text">Tuletikud</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>
+ <span class="talong-text">Tuletikud</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>
+ <span class="talong-text">Alkohol</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>
+ <span class="talong-text">Alkohol</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>
+ <span class="talong-text">Nisujahu</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>
+ <span class="talong-text">Nisujahu</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>
+ <span class="talong-text">Makaron</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>
+ <span class="talong-text">Makaron</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="front-face" src="img/pesupulber.svg" alt="Pesu" />
+ <span class="talong-text">Pesupulber</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="front-face" src="img/pesupulber.svg" alt="Pesu" />
+ <span class="talong-text">Pesupulber</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>
+ <div class="memory-card" data-framework="tang">
+ <img class="front-face" src="img/tang.svg" alt="Tang" />
+ <span class="talong-text">Tangained</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>
+ <div class="memory-card" data-framework="tang">
+ <img class="front-face" src="img/tang.svg" alt="Tang" />
+ <span class="talong-text">Tangained</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>
+ <div class="memory-card" data-framework="wcpaber">
+ <img class="front-face" src="img/wcpaber.svg" alt="Wcpaber" />
+ <span class="talong-text">Wc-paber</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>
+ <div class="memory-card" data-framework="wcpaber">
+ <img class="front-face" src="img/wcpaber.svg" alt="wcpaber" />
+ <span class="talong-text">Wc-paber</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>
diff --git a/rannak/mangud/perenaine/ristsona/index.html b/rannak/mangud/perenaine/ristsona/index.html
index bd09541..e10aa1c 100644
--- a/rannak/mangud/perenaine/ristsona/index.html
+++ b/rannak/mangud/perenaine/ristsona/index.html
@@ -65,20 +65,15 @@
</div>
<div class="modal-body">
- Odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo?
- Arcu non odio euismod lacinia at quis risus sed vulputate odio. Nullam non nisi est,
- sit amet facilisis magna etiam tempor, orci eu lobortis elementum,
- nibh tellus molestie nunc, non blandit massa enim nec dui nunc.
- <br/>
- Odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo?
- Arcu non odio euismod lacinia at quis risus sed vulputate odio. Nullam non nisi est,
- sit amet facilisis magna etiam tempor, orci eu lobortis elementum,
- nibh tellus molestie nunc, non blandit massa enim nec dui nunc.
+
+ Täna õhtul tulevad meile külalised - kolm töökaaslast abikaasadega. <br/>
+ Katan elutuppa linaga laua, nii saan oma uut kohviserviisi ning kristallkausse näidata! <br/>
+ Pakun neile suitsuvorsti ja juustuga võileibu, millele lõikan kenad tomatiroosid. Kindlasti täidetud mune, marineeritud tomateid ja seeni. <br/>
+ Magusaks küpsetan purukooki mustsõstramoosiga, muidugi pakun juurde ka kohvi. <br/>
<br/>
- odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo?
- arcu non odio euismod lacinia at quis risus sed vulputate odio. nullam non nisi est,
- sit amet facilisis magna etiam tempor, orci eu lobortis elementum,
- nibh tellus molestie nunc, non blandit massa enim nec dui nunc.
+ Ja muidugi ei puudu korralikult pidulaualt kartulisalat! Mul õnnestus täna poest kõik tarvilik hankida! <br/>
+ <strong>Pärast ristsõna lahendamist oskad sinagi salatit teha!</strong>
+
</div>
</div>
diff --git a/rannak/mangud/perenaine/ristsona/script.js b/rannak/mangud/perenaine/ristsona/script.js
index cacda18..b542037 100644
--- a/rannak/mangud/perenaine/ristsona/script.js
+++ b/rannak/mangud/perenaine/ristsona/script.js
@@ -171,6 +171,7 @@ function getInputValue() {
+
// Button funcs
function enterSubmit(){
@@ -185,11 +186,38 @@ function enterSubmit(){
}
enterSubmit()
+
+// If All Else Done
+
+
function moveOnEnable(){
+ message("Tubli, täitsid ristsõna. Siin on Kartulisalati Retsept", "green");
+
const btn = document.querySelector(".moveOn");
btn.disabled = false;
btn.onclick = () => location.href = "";
+ // Retsept
+ const middlePart = document.querySelector("table");
+ middlePart.parentNode.removeChild(middlePart);
+
+ const leftPart = document.querySelector(".left");
+ let eller = document.createElement("span");
+
+ eller.innerHTML = "- Keeda koorimata aedviljad eelmisel päeval pehmeks. Lase täielikult jahtuda.</br></br> - Salati tegemiseks koori keedetud kartulid ja porgandid. Haki aedviljad (kartul, porgand, kurk) ja vorst väikesteks kuubikuteks. Haki kahvliga jahtunud munad. Kastme jaoks sega hapukoor ja majonees omavahel. Lisa soola ja pipart. Kalla kaste salatiainetele ning sega õrnalt läbi. </br></br> - Enne serveerimist lase salatil umbes 2-4 tundi sahvris maitsestuda.</br></br> - Salatile võib lisada ka hakitud õunakuubikuid ning konservherneid."
+ eller.classList.add("retsept");
+
+ leftPart.parentNode.insertBefore(eller, leftPart.nextSibling);
+
+
+ // Remove left and right part
+ leftPart.classList.remove("text-white");
+ const rightPart = document.querySelector(".right");
+ rightPart.classList.remove("text-white");
+
+
+
+
// submit btn
const subButton = document.querySelector(".subBtn");
subButton.disabled = true;
diff --git a/rannak/mangud/perenaine/ristsona/style.css b/rannak/mangud/perenaine/ristsona/style.css
index d0d405e..b37fc5d 100644
--- a/rannak/mangud/perenaine/ristsona/style.css
+++ b/rannak/mangud/perenaine/ristsona/style.css
@@ -25,6 +25,18 @@ button:disabled{
cursor: not-allowed;
}
+/* Retsept Lõpus*/
+
+.retsept {
+ margin-top: 5%;
+ width:60%;
+ color: #AFFF80;
+ text-align: center;
+ font-size: 1.2rem;
+}
+
+
+
/* Modal Stuff */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 07:50:27 +0000