From 5346af62569c013049100539f7ed38ef4c34adc1 Mon Sep 17 00:00:00 2001 From: Rasmus Luha Date: Wed, 21 Dec 2022 16:19:54 +0200 Subject: =?UTF-8?q?Perenaine=20=C3=9Cl=201,3=20FullDone?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rannak/mangud/perenaine/memori/img/jahu.svg.bak | 85 ------------- rannak/mangud/perenaine/memori/img/pesu.svg | 65 ---------- rannak/mangud/perenaine/memori/img/pesu.svg.bak | 46 -------- rannak/mangud/perenaine/memori/img/pesupulber.svg | 63 ++++++++++ rannak/mangud/perenaine/memori/img/riis.svg | 14 --- rannak/mangud/perenaine/memori/img/riis.svg.bak | 14 +++ rannak/mangud/perenaine/memori/img/sokid.svg | 138 ---------------------- rannak/mangud/perenaine/memori/img/suhkur.svg.bak | 47 -------- rannak/mangud/perenaine/memori/img/tang.svg | 73 ++++++++++++ rannak/mangud/perenaine/memori/img/wcpaber.svg | 75 ++++++++++++ rannak/mangud/perenaine/memori/index.html | 88 ++++++++------ rannak/mangud/perenaine/ristsona/index.html | 21 ++-- rannak/mangud/perenaine/ristsona/script.js | 28 +++++ rannak/mangud/perenaine/ristsona/style.css | 12 ++ 14 files changed, 322 insertions(+), 447 deletions(-) delete mode 100644 rannak/mangud/perenaine/memori/img/jahu.svg.bak delete mode 100644 rannak/mangud/perenaine/memori/img/pesu.svg delete mode 100644 rannak/mangud/perenaine/memori/img/pesu.svg.bak create mode 100644 rannak/mangud/perenaine/memori/img/pesupulber.svg delete mode 100644 rannak/mangud/perenaine/memori/img/riis.svg create mode 100644 rannak/mangud/perenaine/memori/img/riis.svg.bak delete mode 100644 rannak/mangud/perenaine/memori/img/sokid.svg delete mode 100644 rannak/mangud/perenaine/memori/img/suhkur.svg.bak create mode 100644 rannak/mangud/perenaine/memori/img/tang.svg create mode 100644 rannak/mangud/perenaine/memori/img/wcpaber.svg 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rannak/mangud/perenaine/memori/img/riis.svg b/rannak/mangud/perenaine/memori/img/riis.svg deleted file mode 100644 index 8376e61..0000000 --- a/rannak/mangud/perenaine/memori/img/riis.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/rannak/mangud/perenaine/memori/img/riis.svg.bak b/rannak/mangud/perenaine/memori/img/riis.svg.bak new file mode 100644 index 0000000..8376e61 --- /dev/null +++ b/rannak/mangud/perenaine/memori/img/riis.svg.bak @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ @@ -79,95 +73,111 @@
tikud - Tikud + Tuletikud taga
Tikud - Tikud + Tuletikud taga
Alko - Õlu + Alkohol taga
Alko - Õlu + Alkohol taga
Jahu - Jahu + Nisujahu taga
Jahu - Jahu + Nisujahu taga
Pasta - Pasta + Makaron taga
Pasta - Pasta + Makaron taga
+ + + + + +
- Pesu - Pesu + Pesu + Pesupulber taga
- Pesu - Pesu + Pesu + Pesupulber taga
-
- Riis - Riis +
+ Tang + Tangained taga
-
- Riis - Riis +
+ Tang + Tangained taga
-
- Sokid - Sokid +
+ Wcpaber + Wc-paber taga
-
- sokid - Sokid +
+ wcpaber + Wc-paber taga
+ + + + + + + + + +
Sool Sool 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 @@
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.

- 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.

- Enne serveerimist lase salatil umbes 2-4 tundi sahvris maitsestuda.

- 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 */ -- cgit v1.2.3