From 209b1915b0f1879d0055ea17f76464dddcf8089b Mon Sep 17 00:00:00 2001
From: Rasmus Luha <rasmus.luha@gmail.com>
Date: Sun, 5 Feb 2023 20:43:17 +0200
Subject: =?UTF-8?q?Hinnad=20m=C3=A4ng=20for=20Arimees=20+=20fonts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rannak/mangud/perenaine/memori/img/alko.svg     | 38 ++++++++++++++++++++++++-
 rannak/mangud/perenaine/memori/img/alko.svg.bak |  1 +
 rannak/mangud/perenaine/memori/img/riis.svg.bak | 14 ---------
 rannak/mangud/perenaine/memori/index.html       |  4 +--
 rannak/mangud/perenaine/memori/style.css        |  9 ++++++
 5 files changed, 49 insertions(+), 17 deletions(-)
 create mode 100644 rannak/mangud/perenaine/memori/img/alko.svg.bak
 delete mode 100644 rannak/mangud/perenaine/memori/img/riis.svg.bak

(limited to 'rannak/mangud/perenaine/memori')

diff --git a/rannak/mangud/perenaine/memori/img/alko.svg b/rannak/mangud/perenaine/memori/img/alko.svg
index e7bcc31..6d54db5 100644
--- a/rannak/mangud/perenaine/memori/img/alko.svg
+++ b/rannak/mangud/perenaine/memori/img/alko.svg
@@ -1 +1,37 @@
-<?xml version="1.0" ?><svg width="64px" height="64px" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg"><defs><style>.cls-1{fill:#bcc2d7;}.cls-2{fill:#ab7c73;}.cls-3{fill:#6e5b5e;}.cls-4{fill:#eff3fe;}</style></defs><g id="main"><path class="cls-1" d="M55,20H49a1,1,0,0,0-1,1V48a1,1,0,0,0,1,1A11,11,0,0,0,60,38V25A5,5,0,0,0,55,20ZM50,42.9V26h3a1,1,0,0,1,1,1V38A5,5,0,0,1,50,42.9Z"/><path class="cls-2" d="M48.66,18.71A4.91,4.91,0,0,1,47,19H36a1,1,0,0,0-1,1v7a2,2,0,0,1-4,0V23a4,4,0,0,0-8,0V34a2,2,0,0,1-4,0V20a1,1,0,0,0-1-1H9a1,1,0,0,0-1,1V54a9,9,0,0,0,9,9H41a9,9,0,0,0,9-9V19.65A1,1,0,0,0,48.66,18.71Z"/><path class="cls-3" d="M20,59H17a5,5,0,0,1-5-5V51a1,1,0,0,1,2,0v3a3,3,0,0,0,3,3h3a1,1,0,0,1,0,2Z"/><path class="cls-4" d="M48,7.07A7.09,7.09,0,0,0,41.4,5.19,7,7,0,0,0,29.51,3.65a7,7,0,0,0-8.42-.45A7,7,0,0,0,9.16,6.52,8,8,0,0,0,7.89,20.86,1,1,0,0,0,8.4,21H17V34a4,4,0,0,0,8,0V23a2,2,0,0,1,4,0v4a4,4,0,0,0,8,0V21H47A7,7,0,0,0,48,7.07Z"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" ?>
+
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" id="Layer_1" version="1.1" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
<g>
+
<path d="M23.8535156,1.6464844l-1.5-1.5c-0.1953125-0.1953125-0.5117188-0.1953125-0.7070312,0L19.729126,2.0638428   c-0.1885986-0.098999-0.4240723-0.0759277-0.5826416,0.0826416l-3.7880859,3.7880859   c-1.9462891-0.5317383-4.0078125,0.0078125-5.4482422,1.4477539l-9.0566406,9.0571289C0.3027344,16.9892578,0,17.7211914,0,18.5   s0.3027344,1.5107422,0.8535156,2.0605469l2.5859375,2.5859375C3.9902344,23.6967773,4.7226562,24,5.5,24   s1.5097656-0.3032227,2.0605469-0.8535156l9.0566406-9.0571289c1.4404297-1.4394531,1.9814453-3.5014648,1.4482422-5.4477539   l3.7880859-3.7880859c0.1585693-0.1585693,0.1816406-0.394043,0.0826416-0.5826416l1.9173584-1.9173584   C24.0488281,2.1582031,24.0488281,1.8417969,23.8535156,1.6464844z" fill="#303C42"/>
+
<rect fill="#9F614B" height="7.4853883" transform="matrix(0.7071068 -0.7071068 0.7071068 0.7071068 -8.4705124 10.5501308)" width="7.4853883" x="4.757184" y="11.757184"/>
+
<path d="M6.8535156,22.4394531c-0.7246094,0.7226562-1.9824219,0.7226562-2.7070312,0l-2.5859375-2.5859375   C1.1992188,19.4921875,1,19.0117188,1,18.5s0.1992188-0.9921875,0.5605469-1.3535156L2.5,16.2070312L7.7929688,21.5   L6.8535156,22.4394531z" fill="#676F4B"/>
+
<path d="M17.1464844,8.1464844c-0.1337891,0.1337891-0.1806641,0.3320312-0.1210938,0.5117188   c0.5576172,1.6699219,0.1298828,3.4799805-1.1152344,4.7241211l-1.4103394,1.4104614L9.2068481,9.4998169l1.4103394-1.4104614   c0.8837891-0.8833008,2.0527344-1.3549805,3.2548828-1.3549805c0.4902344,0,0.9863281,0.0786133,1.4697266,0.2397461   c0.1806641,0.0615234,0.3779297,0.0131836,0.5117188-0.1206055L19.5,3.2070312L20.7929688,4.5L17.1464844,8.1464844z" fill="#676F4B"/>
+
<polygon opacity="0.1" points="8.4998169,10.2068481 3.2069702,15.499939 3.7162476,16.0092163 8.9930134,10.7000446  "/>
+
<path d="M2.0605469,17.6650391L3,16.7070312l-0.5-0.5l-0.9394531,0.9394531   C1.1992188,17.5078125,1,17.9882812,1,18.5s0.1992188,0.9921875,0.5605469,1.3535156l0.4143677,0.4143677   C1.6724243,19.920105,1.5,19.4846191,1.5,19.0185547C1.5,18.5068359,1.6992188,18.0263672,2.0605469,17.6650391z" opacity="0.1"/>
+
<path d="M14.3720703,7.2529297c0.4902344,0,0.9863281,0.0786133,1.4697266,0.2397461   c0.1806641,0.0615234,0.3779297,0.0131836,0.5117188-0.1206055l3.6578121-3.6537108L19.5,3.2070312l-3.6464844,3.6464844   c-0.1337891,0.1337891-0.3310547,0.1821289-0.5117188,0.1206055c-0.4833984-0.1611328-0.9794922-0.2397461-1.4697266-0.2397461   c-1.2021484,0-2.3710938,0.4716797-3.2548828,1.3549805L9.2068481,9.4998169l0.5092773,0.5092773l1.401062-1.4011841   C12.0009766,7.7246094,13.1699219,7.2529297,14.3720703,7.2529297z" opacity="0.1"/>
+
<rect fill="#FFFFFF" height="0.7202339" opacity="0.2" transform="matrix(0.7025585 -0.711626 0.711626 0.7025585 -9.4893856 13.0718641)" width="7.4876971" x="7.1486149" y="17.5274487"/>
+
<path d="M6.3550715,21.9159241c-0.7246094,0.7226562-1.9824219,0.7226562-2.7070312,0l0.5,0.5185547   c0.7246094,0.7226562,1.9824219,0.7226562,2.7070312,0L7.7929688,21.5l-0.5113282-0.5113277L6.3550715,21.9159241z" fill="#FFFFFF" opacity="0.2"/>
+
<path d="M17.1480408,8.14151l3.6464844-3.6464849l-0.5125713-0.5060406l-3.633913,3.6339703   c-0.1337891,0.1337891-0.1806641,0.3320312-0.1210938,0.5117192c0.5576172,1.6699219,0.1298828,3.4799805-1.1152344,4.7241211   l-1.4258442,1.420042l0.5155048,0.5089741l1.4103394-1.4104614c1.2451172-1.2441406,1.6728516-3.0541992,1.1152344-4.7241211   C16.9673767,8.4735413,17.0142517,8.2752991,17.1480408,8.14151z" fill="#FFFFFF" opacity="0.2"/>
+
<rect fill="#FED4A3" height="1.1214272" transform="matrix(0.7071068 -0.7071068 0.7071068 0.7071068 4.6544371 15.9868059)" width="2.1820874" x="20.5339565" y="1.8142865"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.6483169" x2="18.3335743" y1="7.8812494" y2="14.2627897">
+
<stop offset="0" style="stop-color:#FFFFFF;stop-opacity:0.2"/>
+
<stop offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+
</linearGradient>
+
<path d="M23.8535156,1.6464844l-1.5-1.5c-0.1953125-0.1953125-0.5117188-0.1953125-0.7070312,0   L19.729126,2.0638428c-0.1885986-0.098999-0.4240723-0.0759277-0.5826416,0.0826416l-3.7880859,3.7880859   c-1.9462891-0.5317383-4.0078125,0.0078125-5.4482422,1.4477539l-9.0566406,9.0571289C0.3027344,16.9892578,0,17.7211914,0,18.5   s0.3027344,1.5107422,0.8535156,2.0605469l2.5859375,2.5859375C3.9902344,23.6967773,4.7226562,24,5.5,24   s1.5097656-0.3032227,2.0605469-0.8535156l9.0566406-9.0571289c1.4404297-1.4394531,1.9814453-3.5014648,1.4482422-5.4477539   l3.7880859-3.7880859c0.1585693-0.1585693,0.1816406-0.394043,0.0826416-0.5826416l1.9173584-1.9173584   C24.0488281,2.1582031,24.0488281,1.8417969,23.8535156,1.6464844z" fill="url(#SVGID_1_)"/>
+
</g>
+
<g/>
+
<g/>
+
<g/>
+
<g/>
+
<g/>
+
<g/>
+
<g/>
+
<g/>
+
<g/>
+
<g/>
+
<g/>
+
<g/>
+
<g/>
+
<g/>
+
<g/>
+
</svg>
\ No newline at end of file
diff --git a/rannak/mangud/perenaine/memori/img/alko.svg.bak b/rannak/mangud/perenaine/memori/img/alko.svg.bak
new file mode 100644
index 0000000..e7bcc31
--- /dev/null
+++ b/rannak/mangud/perenaine/memori/img/alko.svg.bak
@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg width="64px" height="64px" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg"><defs><style>.cls-1{fill:#bcc2d7;}.cls-2{fill:#ab7c73;}.cls-3{fill:#6e5b5e;}.cls-4{fill:#eff3fe;}</style></defs><g id="main"><path class="cls-1" d="M55,20H49a1,1,0,0,0-1,1V48a1,1,0,0,0,1,1A11,11,0,0,0,60,38V25A5,5,0,0,0,55,20ZM50,42.9V26h3a1,1,0,0,1,1,1V38A5,5,0,0,1,50,42.9Z"/><path class="cls-2" d="M48.66,18.71A4.91,4.91,0,0,1,47,19H36a1,1,0,0,0-1,1v7a2,2,0,0,1-4,0V23a4,4,0,0,0-8,0V34a2,2,0,0,1-4,0V20a1,1,0,0,0-1-1H9a1,1,0,0,0-1,1V54a9,9,0,0,0,9,9H41a9,9,0,0,0,9-9V19.65A1,1,0,0,0,48.66,18.71Z"/><path class="cls-3" d="M20,59H17a5,5,0,0,1-5-5V51a1,1,0,0,1,2,0v3a3,3,0,0,0,3,3h3a1,1,0,0,1,0,2Z"/><path class="cls-4" d="M48,7.07A7.09,7.09,0,0,0,41.4,5.19,7,7,0,0,0,29.51,3.65a7,7,0,0,0-8.42-.45A7,7,0,0,0,9.16,6.52,8,8,0,0,0,7.89,20.86,1,1,0,0,0,8.4,21H17V34a4,4,0,0,0,8,0V23a2,2,0,0,1,4,0v4a4,4,0,0,0,8,0V21H47A7,7,0,0,0,48,7.07Z"/></g></svg>
\ No newline at end of file
diff --git a/rannak/mangud/perenaine/memori/img/riis.svg.bak b/rannak/mangud/perenaine/memori/img/riis.svg.bak
deleted file mode 100644
index 8376e61..0000000
--- a/rannak/mangud/perenaine/memori/img/riis.svg.bak
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg width="72px" height="72px" viewBox="0 0 72 72" id="emoji" xmlns="http://www.w3.org/2000/svg">
-  <g id="color">
-    <path fill="#FFFFFF" stroke="none" d="M8.1221,36v-3.5859c-0.1543-0.4287,0.8281-0.9073,0.999-1.3672c0.126-0.336,0.3379-0.6114,0.5957-0.8272 c-0.4834-0.5361-0.666-1.3095-0.3965-2.0332c0.3067-0.8232,1.0986-1.3154,1.9307-1.292c-0.1895-0.4521-0.2188-0.9736-0.0342-1.4697 c0.1865-0.5,0.5537-0.8769,0.998-1.0937c-0.2265-0.4727-0.2714-1.0332-0.0742-1.5635c0.3291-0.8809,1.2119-1.3867,2.1065-1.2822 c-0.1446-0.419-0.1651-0.8838,0.0029-1.3331c0.3857-1.0351,1.5381-1.5615,2.5723-1.1757c0.0947,0.0351,0.1787,0.083,0.2646,0.1308 c-0.0654-0.3467-0.0469-0.7129,0.085-1.0674c0.2099-0.5625,0.6494-0.9677,1.1699-1.165c-0.2647-0.4902-0.332-1.083-0.1221-1.6465 c0.3858-1.0342,1.5371-1.5605,2.5723-1.1758c0.3545,0.1328,0.6435,0.3594,0.8623,0.6348c0.0205-0.0947,0.04-0.1904,0.0752-0.2852 c0.3047-0.8173,1.0889-1.3085,1.915-1.2929c-0.0908-0.375-0.0752-0.7793,0.0694-1.168c0.3857-1.0351,1.5381-1.5615,2.5722-1.1758 c0.3555,0.1319,0.6436,0.3584,0.8633,0.6348c0.0195-0.0957,0.0391-0.1914,0.0742-0.2852c0.334-0.8974,1.2461-1.4101,2.1563-1.2798 C29.7432,9.3315,30.3311,9,31,9c0.873,0,1.6074,0.563,1.8799,1.3428C33.2002,10.1265,33.585,10,34,10 c0.0898,0,0.1768,0.0151,0.2627,0.0264C34.6055,9.417,35.251,9,36,9s1.3945,0.417,1.7373,1.0264C37.8232,10.0151,37.9102,10,38,10 c0.415,0,0.7998,0.1265,1.1201,0.3428C39.3926,9.563,40.127,9,41,9c0.6689,0,1.2568,0.3315,1.6201,0.8354 c0.9102-0.1303,1.8223,0.3824,2.1563,1.2798c0.0351,0.0938,0.0547,0.1895,0.0742,0.2852c0.2197-0.2764,0.5078-0.5029,0.8633-0.6348 c1.0341-0.3857,2.1865,0.1407,2.5722,1.1758c0.1446,0.3887,0.1602,0.793,0.0694,1.168c0.8261-0.0156,1.6103,0.4756,1.915,1.2929 c0.0352,0.0948,0.0547,0.1905,0.0752,0.2852c0.2188-0.2754,0.5078-0.502,0.8623-0.6348c1.0352-0.3847,2.1865,0.1416,2.5723,1.1758 c0.2099,0.5635,0.1426,1.1563-0.1221,1.6465c0.5205,0.1973,0.96,0.6025,1.1699,1.165c0.1319,0.3545,0.1504,0.7207,0.085,1.0674 c0.0859-0.0478,0.1699-0.0957,0.2646-0.1308c1.0342-0.3858,2.1866,0.1406,2.5723,1.1757c0.168,0.4493,0.1475,0.9141,0.0029,1.3331 c0.8946-0.1045,1.7774,0.4013,2.1065,1.2822c0.1972,0.5303,0.1523,1.0908-0.0742,1.5635c0.4443,0.2168,0.8115,0.5937,0.998,1.0937 c0.1846,0.4961,0.1553,1.0176-0.0342,1.4697c0.8321-0.0234,1.624,0.4688,1.9307,1.292c0.2695,0.7237,0.0869,1.4971-0.3965,2.0332 c0.2578,0.2158,0.4697,0.4912,0.5957,0.8272c0.1709,0.4599,1.1533,0.9385,0.999,1.3672V36"/>
-    <path fill="#FFFFFF" stroke="none" d="M65,36c0,16.0156-12.9834,29-29,29S7,52.0156,7,36H65z"/>
-    <path fill="#d0cfce" stroke="none" d="M49,36c0,16.0156-4,29-13,29c16.0166,0,29-12.9844,29-29H49z"/>
-  </g>
-  <g id="hair"/>
-  <g id="skin"/>
-  <g id="skin-shadow"/>
-  <g id="line">
-    <path fill="none" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" d="M62.8779,32.4141c0.1543-0.4287,0.1719-0.9073,0.001-1.3672c-0.126-0.336-0.3379-0.6114-0.5957-0.8272 c0.4834-0.5361,0.666-1.3095,0.3965-2.0332c-0.3067-0.8232-1.0986-1.3154-1.9307-1.292c0.1895-0.4521,0.2188-0.9736,0.0342-1.4697 c-0.1865-0.5-0.5537-0.8769-0.998-1.0937c0.2265-0.4727,0.2714-1.0332,0.0742-1.5635c-0.3291-0.8809-1.2119-1.3867-2.1065-1.2822 c0.1446-0.419,0.1651-0.8838-0.0029-1.3331c-0.3857-1.0351-1.5381-1.5615-2.5723-1.1757c-0.0947,0.0351-0.1787,0.083-0.2646,0.1308 c0.0654-0.3467,0.0469-0.7129-0.085-1.0674c-0.2099-0.5625-0.6494-0.9677-1.1699-1.165c0.2647-0.4902,0.332-1.083,0.1221-1.6465 c-0.3858-1.0342-1.5371-1.5605-2.5723-1.1758c-0.3545,0.1328-0.6435,0.3594-0.8623,0.6348 c-0.0205-0.0947-0.04-0.1904-0.0752-0.2852c-0.3047-0.8173-1.0889-1.3085-1.915-1.2929c0.0908-0.375,0.0752-0.7793-0.0694-1.168 c-0.3857-1.0351-1.5381-1.5615-2.5722-1.1758c-0.3555,0.1319-0.6436,0.3584-0.8633,0.6348 c-0.0195-0.0957-0.0391-0.1914-0.0742-0.2852c-0.334-0.8974-1.2461-1.4101-2.1563-1.2798C42.2568,9.3315,41.6689,9,41,9 c-0.873,0-1.6074,0.563-1.8799,1.3428C38.7998,10.1265,38.415,10,38,10c-0.0898,0-0.1768,0.0151-0.2627,0.0264 C37.3945,9.417,36.749,9,36,9s-1.3945,0.417-1.7373,1.0264C34.1768,10.0151,34.0898,10,34,10c-0.415,0-0.7998,0.1265-1.1201,0.3428 C32.6074,9.563,31.873,9,31,9c-0.6689,0-1.2568,0.3315-1.6201,0.8354c-0.9102-0.1303-1.8223,0.3824-2.1563,1.2798 c-0.0351,0.0938-0.0547,0.1895-0.0742,0.2852c-0.2197-0.2764-0.5078-0.5029-0.8633-0.6348 c-1.0341-0.3857-2.1865,0.1407-2.5722,1.1758c-0.1446,0.3887-0.1602,0.793-0.0694,1.168c-0.8261-0.0156-1.6103,0.4756-1.915,1.2929 c-0.0352,0.0948-0.0547,0.1905-0.0752,0.2852c-0.2188-0.2754-0.5078-0.502-0.8623-0.6348 c-1.0352-0.3847-2.1865,0.1416-2.5723,1.1758c-0.2099,0.5635-0.1426,1.1563,0.1221,1.6465c-0.5205,0.1973-0.96,0.6025-1.1699,1.165 c-0.1319,0.3545-0.1504,0.7207-0.085,1.0674c-0.0859-0.0478-0.1699-0.0957-0.2646-0.1308 c-1.0342-0.3858-2.1866,0.1406-2.5723,1.1757c-0.168,0.4493-0.1475,0.9141-0.0029,1.3331 c-0.8946-0.1045-1.7774,0.4013-2.1065,1.2822c-0.1972,0.5303-0.1523,1.0908,0.0742,1.5635 c-0.4443,0.2168-0.8115,0.5937-0.998,1.0937c-0.1846,0.4961-0.1553,1.0176,0.0342,1.4697c-0.8321-0.0234-1.624,0.4688-1.9307,1.292 c-0.2695,0.7237-0.0869,1.4971,0.3965,2.0332c-0.2578,0.2158-0.4697,0.4912-0.5957,0.8272 c-0.1709,0.4599-0.1533,0.9385,0.001,1.3672"/>
-    <path fill="none" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" d="M65,36c0,16.0156-12.9834,29-29,29S7,52.0156,7,36H65z"/>
-  </g>
-</svg>
diff --git a/rannak/mangud/perenaine/memori/index.html b/rannak/mangud/perenaine/memori/index.html
index c8fd288..21c3583 100644
--- a/rannak/mangud/perenaine/memori/index.html
+++ b/rannak/mangud/perenaine/memori/index.html
@@ -4,10 +4,10 @@
   <meta charset="UTF-8">
 
   <title>Memori</title>
-
-  <link rel="stylesheet" href="style.css">
   <!-- Bootstrap - CSS only -->
   <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
+
+  <link rel="stylesheet" href="style.css">
 </head>
 <body>
 
diff --git a/rannak/mangud/perenaine/memori/style.css b/rannak/mangud/perenaine/memori/style.css
index fa7a05a..f76cfda 100644
--- a/rannak/mangud/perenaine/memori/style.css
+++ b/rannak/mangud/perenaine/memori/style.css
@@ -7,7 +7,16 @@
 body {
   height: 100vh;
   display: flex;
+  background-color: #43464b;
+  color: white;
+  /*
   background: #eeee90 !important;
+  */
+}
+
+h1 {
+    color: #FEDD00;
+    font-weight: bold;
 }
 
 .moveOn{
-- 
cgit v1.2.3