added Muusika and Kuulamine

author: Rasmus <rasmus.luha@gmail.com> 2023-03-10 19:09:53 +0200
committer: Rasmus <rasmus.luha@gmail.com> 2023-03-10 19:09:53 +0200
commit: f05f15dbe108e3fd10af8d15fb15c1b27e689f96 (patch)
tree: 5f6d888bbf5f2dbce5a21df15323c3f8e143b19b /rannak/mangud/arimees
parent: c525b29ceb91c0abacfe9916aafb1b0b48d47880 (diff)
56 files changed, 455 insertions, 5 deletions
diff --git a/rannak/mangud/arimees/muusika/index.html b/rannak/mangud/arimees/muusika/index.html
new file mode 100755
index 0000000..916e7e9
--- /dev/null
+++ b/rannak/mangud/arimees/muusika/index.html
@@ -0,0 +1,269 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+  <title>Muusika</title>
+  <!-- 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>
+
+
+    <!-- Button trigger modal -->
+    <button id="testModal" type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal">
+      Sissejuhatus
+    </button>
+
+    <div class="container text-white text-center">
+	  <h1>Muusika</h1>
+	  <p>
+        Vajuta lingile ja vaata muusikavideosid, või kuula siinsamas,
+        <br/>
+        ning järjesta siis need vastavalt oma eelistustele.
+     </p>
+
+	  <div class="text-center">
+
+		<div class="col">
+          <button class="moveOn" disabled>Liigu Edasi</button>
+		</div>
+
+	  </div>
+    </div>
+
+
+    <!-- Modal -->
+    <div class="modal fade text-black" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+      <div class="modal-dialog" role="document">
+        <div class="modal-content">
+
+          <div class="modal-header">
+            <div class="modalHeaderWrapper">
+              <h3 class="modal-title" id="myModalLabel">Sissejuhatus</h5>
+            </div>
+            <img class="avatar" alt="avatar" src="pildid/avatar.png"/>
+          </div>
+
+          <div class="modal-body">
+
+            <p>
+              Tsau jälle! Ma sain eelmisel nädalal tutika playeri! Sellega on nüüd süngelt
+              hea mussi kuulata. Kui laeval olen või Viru juures somme ootan, siis panen
+              musa peale ja väga mõnus on. Eks ma kuulan rohkem välismaa punte, lindistan
+              neid otse Luxembourgi raadiost või Soome televisioonist, aga Eestis on ka
+              päris kuulatavat kraami. Valisin mõned lood oma kassetidelt kuulata.
+              Vaata, kas tunned ära, kes laulab? Ühe loo panin oma mampsi kassetilt ka.
+            </p>
+            <br/>
+            <p>
+              <strong>
+                Ja noh, minul on siin nimekirjas omad lemmikud, aga millised on sinu?
+                Tee oma edetabel ning põhjenda paari lausega esikoha valikut.
+              </strong>
+            </p>
+
+          </div>
+
+        </div>
+      </div>
+    </div>
+
+
+    <!-- Main Stuff -->
+    <div class="main">
+      <ul>
+
+        <li>
+          <div class="laul">
+            <select>
+              <option disabled hidden selected>Vali</option>
+              <option value="1">1.</option>
+              <option value="2">2.</option>
+              <option value="3">3.</option>
+              <option value="4">4.</option>
+              <option value="5">5.</option>
+              <option value="6">6.</option>
+            </select>
+
+            <div class="info">
+              <h2>Ivo Linna ja In Spe</h2>
+              <a target="_blank" href="https://www.youtube.com/watch?v=Wcf7it9O0OU">
+              "Eestlane olen ja eestlaseks jään"
+              </a>
+            </div>
+
+            <audio controls>
+              <source src="laulud/EestlaneOlen.mp3" type="audio/mpeg">
+              Your browser does not support the audio element.
+            </audio> 
+
+          </div>
+        </li>
+
+
+
+
+        <li>
+          <div class="laul">
+            <select>
+              <option disabled hidden selected>Vali</option>
+              <option value="1">1.</option>
+              <option value="2">2.</option>
+              <option value="3">3.</option>
+              <option value="4">4.</option>
+              <option value="5">5.</option>
+              <option value="6">6.</option>
+            </select>
+
+              <div class="info">
+                <h2>JMKE</h2>
+                <a target="_blank" href="https://www.youtube.com/watch?v=HDUFL_HW_7A">
+                  "Tere, perestroika!"
+                </a>
+              </div>
+
+              <audio controls>
+                <source src="laulud/TerePerestroika.mp3" type="audio/mpeg">
+                Your browser does not support the audio element.
+              </audio>
+
+          </div>
+        </li>
+
+
+
+
+        <li>
+          <div class="laul">
+            <select>
+              <option disabled hidden selected>Vali</option>
+              <option value="1">1.</option>
+              <option value="2">2.</option>
+              <option value="3">3.</option>
+              <option value="4">4.</option>
+              <option value="5">5.</option>
+              <option value="6">6.</option>
+            </select>
+
+              <div class="info">
+                <h2>Jäääär</h2>
+                <a target="_blank" href="https://www.youtube.com/watch?v=85rgjwf2ZtQ">
+                  "Õhk kõnnib tänaval"
+                </a>
+              </div>
+
+              <audio controls>
+                <source src="laulud/OhkKonnibTanaval.mp3" type="audio/mpeg">
+                Your browser does not support the audio element.
+              </audio> 
+
+          </div>
+        </li>
+
+
+
+
+        <li>
+          <div class="laul">
+            <select>
+              <option disabled hidden selected>Vali</option>
+              <option value="1">1.</option>
+              <option value="2">2.</option>
+              <option value="3">3.</option>
+              <option value="4">4.</option>
+              <option value="5">5.</option>
+              <option value="6">6.</option>
+            </select>
+
+              <div class="info">
+                <h2>Kare Kauks</h2>
+                <a target="_blank" href="https://www.youtube.com/watch?v=VlORhJq3UKE">
+                  "Mägede hääl"
+                </a>
+              </div>
+
+              <audio controls>
+                <source src="laulud/MagedeHaal.mp3" type="audio/mpeg">
+                Your browser does not support the audio element.
+              </audio> 
+
+          </div>
+        </li>
+
+
+
+
+        <li>
+          <div class="laul">
+            <select>
+              <option disabled hidden selected>Vali</option>
+              <option value="1">1.</option>
+              <option value="2">2.</option>
+              <option value="3">3.</option>
+              <option value="4">4.</option>
+              <option value="5">5.</option>
+              <option value="6">6.</option>
+            </select>
+
+              <div class="info">
+                <h2>Sõnajalg</h2>
+                <a target="_blank" href="https://www.youtube.com/watch?v=Zd6fwliA7_k">
+                  "Tulge kõik"
+                </a>
+              </div>
+
+              <audio controls>
+                <source src="laulud/TulgeKoik.mp3" type="audio/mpeg">
+                Your browser does not support the audio element.
+              </audio> 
+
+          </div>
+        </li>
+
+
+
+        
+        <li>
+          <div class="laul">
+            <select>
+              <option disabled hidden selected>Vali</option>
+              <option value="1">1.</option>
+              <option value="2">2.</option>
+              <option value="3">3.</option>
+              <option value="4">4.</option>
+              <option value="5">5.</option>
+              <option value="6">6.</option>
+            </select>
+
+              <div class="info">
+                <h2>Vennaskond</h2>
+                <a target="_blank" href="https://www.youtube.com/watch?v=AnBPT4hEPM4">
+                  "Appi, ma vajan armastust"
+                </a>
+              </div>
+
+              <audio controls>
+                <source src="laulud/AppiMaVajanArmastust.mp3" type="audio/mpeg">
+                Your browser does not support the audio element.
+              </audio>
+
+          </div>
+        </li>
+ 
+      </ul>
+    </div>
+    <!-- Main End -->
+
+
+  <script src="script.js"></script>
+
+  <!-- JavaScript Bundle with Popper -->
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script>
+
+</body>
+</html>
diff --git a/rannak/mangud/arimees/muusika/laulud/AppiMaVajanArmastust.mp3 b/rannak/mangud/arimees/muusika/laulud/AppiMaVajanArmastust.mp3
new file mode 100644
index 0000000..fbb335b
--- /dev/null
+++ b/rannak/mangud/arimees/muusika/laulud/AppiMaVajanArmastust.mp3
diff --git a/rannak/mangud/arimees/muusika/laulud/EestlaneOlen.mp3 b/rannak/mangud/arimees/muusika/laulud/EestlaneOlen.mp3
new file mode 100644
index 0000000..416d251
--- /dev/null
+++ b/rannak/mangud/arimees/muusika/laulud/EestlaneOlen.mp3
diff --git a/rannak/mangud/arimees/muusika/laulud/MagedeHaal.mp3 b/rannak/mangud/arimees/muusika/laulud/MagedeHaal.mp3
new file mode 100644
index 0000000..245faa4
--- /dev/null
+++ b/rannak/mangud/arimees/muusika/laulud/MagedeHaal.mp3
diff --git a/rannak/mangud/arimees/muusika/laulud/OhkKonnidTanaval.mp3 b/rannak/mangud/arimees/muusika/laulud/OhkKonnidTanaval.mp3
new file mode 100644
index 0000000..3fa9fbd
--- /dev/null
+++ b/rannak/mangud/arimees/muusika/laulud/OhkKonnidTanaval.mp3
diff --git a/rannak/mangud/arimees/muusika/laulud/TerePerestroika.mp3 b/rannak/mangud/arimees/muusika/laulud/TerePerestroika.mp3
new file mode 100644
index 0000000..2936f6e
--- /dev/null
+++ b/rannak/mangud/arimees/muusika/laulud/TerePerestroika.mp3
diff --git a/rannak/mangud/arimees/muusika/laulud/TulgeKoik.mp3 b/rannak/mangud/arimees/muusika/laulud/TulgeKoik.mp3
new file mode 100644
index 0000000..649866d
--- /dev/null
+++ b/rannak/mangud/arimees/muusika/laulud/TulgeKoik.mp3
diff --git a/rannak/mangud/arimees/muusika/pildid/avatar.png b/rannak/mangud/arimees/muusika/pildid/avatar.png
new file mode 100755
index 0000000..3cb21cf
--- /dev/null
+++ b/rannak/mangud/arimees/muusika/pildid/avatar.png
diff --git a/rannak/mangud/arimees/muusika/script.js b/rannak/mangud/arimees/muusika/script.js
new file mode 100755
index 0000000..8803bbe
--- /dev/null
+++ b/rannak/mangud/arimees/muusika/script.js
@@ -0,0 +1,32 @@
+document.addEventListener('DOMContentLoaded', () => {
+    let btn = document.querySelector('.modalButton');
+    btn.click();
+});
+
+
+const selectors = document.querySelectorAll('select');
+
+for(el of selectors){
+    el.addEventListener('change', () => {
+
+        let selected = new Array();
+        for (el of selectors){
+            if (!selected.includes(el.value) && el.value != 'Vali')
+                selected.push(el.value);
+        }
+
+        if (selected.length == 6)
+            moveOnEnable();
+        
+    });
+}
+
+
+// If All Else Done
+
+function moveOnEnable(){
+    const btn = document.querySelector(".moveOn");
+    btn.disabled = false;
+    btn.onclick = () => location.href = "";
+}
+
diff --git a/rannak/mangud/arimees/muusika/style.css b/rannak/mangud/arimees/muusika/style.css
new file mode 100755
index 0000000..ab7c91d
--- /dev/null
+++ b/rannak/mangud/arimees/muusika/style.css
@@ -0,0 +1,148 @@
+* {box-sizing: border-box;}
+
+
+body{
+    background-color: #43464b;
+}
+
+
+h1 {
+    color: #2FF924;
+    font-weight: bold;
+}
+
+.moveOn{
+    display: inline-block;
+    border: none;
+    padding: 6px 12px;
+    margin-botton: 0;
+    font-size: 1rem;
+    font-weight: normal;
+    text-align: center;
+    cursor: pointer;
+    border-radius: 4px;
+    background-color: #4BB543;
+    color: white;
+}
+
+button:disabled{
+    opacity: 0.5;
+    cursor: not-allowed;
+}
+
+
+
+
+/* Modal Stuff */
+
+.avatar {
+    border-radius: 20px;
+    width: 100%;
+    max-width: 15rem;
+}
+
+.modalHeaderWrapper{
+    text-align: center;
+    margin: 0;
+    width: 100%;
+}
+
+
+
+.closeModalButton {
+  border-radius: 50px;
+}
+
+.modalButton{
+    position: absolute;
+    top: 0;
+    right: 0;
+    padding: 6px;
+    padding: 9px 25px;
+    background-color: rgba(0,136,169,1);
+    border: none;
+    border-radius: 50px;
+    cursor: pointer;
+    transition: all 0.3 ease 0;
+    margin: 3%;
+    font-size: 1.2rem;
+}
+
+.modalButton:hover{
+    background-color: rgba(0,136,169,0.8);
+}
+
+
+
+/* Main */
+
+.main {
+    margin-top: 2rem;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+ul{
+    width: 67vw;
+    background-color: #fff;
+    border-radius: 1rem;
+    list-style: none;
+    overflow: hidden;
+    padding: 0;
+}
+
+
+
+li{
+    display: flex;
+    align-items: center;
+    transition: .3s ease;
+}
+
+li:nth-child(even){background-color: #eee8;}
+li:hover{transform: scale(1.03);}
+
+
+.laul{
+    display: flex;
+    align-items: center;
+    padding: 1rem;
+    min-width: 100%;
+}
+
+.laulInner {
+    display: flex;
+    justify-content: space-between;
+        
+}
+
+
+
+.info {
+    padding-left: 1rem;
+    text-align: center;
+    border-left: .3rem solid #000;
+    width: 50%;
+}
+
+.audioWrap{
+        width: 50%;
+}
+
+.info a {
+    text-decoration: underline;
+    font-weight: bold;
+    color: #000;
+}
+
+.info h2{font-size: 1.2rem;}
+select{margin-right: 1rem;}
+
+select {
+   -webkit-appearance: menulist-button;
+   height: 3rem;
+   width: 5rem;
+   font-size: 1.5rem;
+
+}
diff --git a/rannak/mangud/arimees/pood.bak/fonts/1001fonts-eutemia-i-eula.txt b/rannak/mangud/arimees/pood.bak/fonts/1001fonts-eutemia-i-eula.txt
index b3cf91f..b3cf91f 100644..100755
--- a/rannak/mangud/arimees/pood.bak/fonts/1001fonts-eutemia-i-eula.txt
+++ b/rannak/mangud/arimees/pood.bak/fonts/1001fonts-eutemia-i-eula.txt
diff --git a/rannak/mangud/arimees/pood.bak/fonts/Eutemia.ttf b/rannak/mangud/arimees/pood.bak/fonts/Eutemia.ttf
index c575e59..c575e59 100644..100755
--- a/rannak/mangud/arimees/pood.bak/fonts/Eutemia.ttf
+++ b/rannak/mangud/arimees/pood.bak/fonts/Eutemia.ttf
diff --git a/rannak/mangud/arimees/pood.bak/index.html b/rannak/mangud/arimees/pood.bak/index.html
index 5b01902..5b01902 100644..100755
--- a/rannak/mangud/arimees/pood.bak/index.html
+++ b/rannak/mangud/arimees/pood.bak/index.html
diff --git a/rannak/mangud/arimees/pood.bak/pildid/avatar.png b/rannak/mangud/arimees/pood.bak/pildid/avatar.png
index 3cb21cf..3cb21cf 100644..100755
--- a/rannak/mangud/arimees/pood.bak/pildid/avatar.png
+++ b/rannak/mangud/arimees/pood.bak/pildid/avatar.png
diff --git a/rannak/mangud/arimees/pood.bak/pildid/kingad.png b/rannak/mangud/arimees/pood.bak/pildid/kingad.png
index ef106ae..ef106ae 100644..100755
--- a/rannak/mangud/arimees/pood.bak/pildid/kingad.png
+++ b/rannak/mangud/arimees/pood.bak/pildid/kingad.png
diff --git a/rannak/mangud/arimees/pood.bak/pildid/kohver.png b/rannak/mangud/arimees/pood.bak/pildid/kohver.png
index 485b6db..485b6db 100644..100755
--- a/rannak/mangud/arimees/pood.bak/pildid/kohver.png
+++ b/rannak/mangud/arimees/pood.bak/pildid/kohver.png
diff --git a/rannak/mangud/arimees/pood.bak/pildid/kupsis.png b/rannak/mangud/arimees/pood.bak/pildid/kupsis.png
index 2419f89..2419f89 100644..100755
--- a/rannak/mangud/arimees/pood.bak/pildid/kupsis.png
+++ b/rannak/mangud/arimees/pood.bak/pildid/kupsis.png
diff --git a/rannak/mangud/arimees/pood.bak/pildid/laud.png b/rannak/mangud/arimees/pood.bak/pildid/laud.png
index e3036dc..e3036dc 100644..100755
--- a/rannak/mangud/arimees/pood.bak/pildid/laud.png
+++ b/rannak/mangud/arimees/pood.bak/pildid/laud.png
diff --git a/rannak/mangud/arimees/pood.bak/pildid/sai.png b/rannak/mangud/arimees/pood.bak/pildid/sai.png
index 8add13c..8add13c 100644..100755
--- a/rannak/mangud/arimees/pood.bak/pildid/sai.png
+++ b/rannak/mangud/arimees/pood.bak/pildid/sai.png
diff --git a/rannak/mangud/arimees/pood.bak/pildid/tugitool.png b/rannak/mangud/arimees/pood.bak/pildid/tugitool.png
index c48bd50..c48bd50 100644..100755
--- a/rannak/mangud/arimees/pood.bak/pildid/tugitool.png
+++ b/rannak/mangud/arimees/pood.bak/pildid/tugitool.png
diff --git a/rannak/mangud/arimees/pood.bak/script.js b/rannak/mangud/arimees/pood.bak/script.js
index 3b3e67b..3b3e67b 100644..100755
--- a/rannak/mangud/arimees/pood.bak/script.js
+++ b/rannak/mangud/arimees/pood.bak/script.js
diff --git a/rannak/mangud/arimees/pood.bak/styles.css b/rannak/mangud/arimees/pood.bak/styles.css
index 58bc290..58bc290 100644..100755
--- a/rannak/mangud/arimees/pood.bak/styles.css
+++ b/rannak/mangud/arimees/pood.bak/styles.css
diff --git a/rannak/mangud/arimees/pood/fonts/1001fonts-eutemia-i-eula.txt b/rannak/mangud/arimees/pood/fonts/1001fonts-eutemia-i-eula.txt
index b3cf91f..b3cf91f 100644..100755
--- a/rannak/mangud/arimees/pood/fonts/1001fonts-eutemia-i-eula.txt
+++ b/rannak/mangud/arimees/pood/fonts/1001fonts-eutemia-i-eula.txt
diff --git a/rannak/mangud/arimees/pood/fonts/Eutemia.ttf b/rannak/mangud/arimees/pood/fonts/Eutemia.ttf
index c575e59..c575e59 100644..100755
--- a/rannak/mangud/arimees/pood/fonts/Eutemia.ttf
+++ b/rannak/mangud/arimees/pood/fonts/Eutemia.ttf
diff --git a/rannak/mangud/arimees/pood/index.html b/rannak/mangud/arimees/pood/index.html
index 6c2f7b5..6c2f7b5 100644..100755
--- a/rannak/mangud/arimees/pood/index.html
+++ b/rannak/mangud/arimees/pood/index.html
diff --git a/rannak/mangud/arimees/pood/pildid/avatar.png b/rannak/mangud/arimees/pood/pildid/avatar.png
index 3cb21cf..3cb21cf 100644..100755
--- a/rannak/mangud/arimees/pood/pildid/avatar.png
+++ b/rannak/mangud/arimees/pood/pildid/avatar.png
diff --git a/rannak/mangud/arimees/pood/pildid/kingad.png b/rannak/mangud/arimees/pood/pildid/kingad.png
index ef106ae..ef106ae 100644..100755
--- a/rannak/mangud/arimees/pood/pildid/kingad.png
+++ b/rannak/mangud/arimees/pood/pildid/kingad.png
diff --git a/rannak/mangud/arimees/pood/pildid/kohver.png b/rannak/mangud/arimees/pood/pildid/kohver.png
index 485b6db..485b6db 100644..100755
--- a/rannak/mangud/arimees/pood/pildid/kohver.png
+++ b/rannak/mangud/arimees/pood/pildid/kohver.png
diff --git a/rannak/mangud/arimees/pood/pildid/kupsis.png b/rannak/mangud/arimees/pood/pildid/kupsis.png
index 2419f89..2419f89 100644..100755
--- a/rannak/mangud/arimees/pood/pildid/kupsis.png
+++ b/rannak/mangud/arimees/pood/pildid/kupsis.png
diff --git a/rannak/mangud/arimees/pood/pildid/laud.png b/rannak/mangud/arimees/pood/pildid/laud.png
index e3036dc..e3036dc 100644..100755
--- a/rannak/mangud/arimees/pood/pildid/laud.png
+++ b/rannak/mangud/arimees/pood/pildid/laud.png
diff --git a/rannak/mangud/arimees/pood/pildid/sai.png b/rannak/mangud/arimees/pood/pildid/sai.png
index 8add13c..8add13c 100644..100755
--- a/rannak/mangud/arimees/pood/pildid/sai.png
+++ b/rannak/mangud/arimees/pood/pildid/sai.png
diff --git a/rannak/mangud/arimees/pood/pildid/tugitool.png b/rannak/mangud/arimees/pood/pildid/tugitool.png
index c48bd50..c48bd50 100644..100755
--- a/rannak/mangud/arimees/pood/pildid/tugitool.png
+++ b/rannak/mangud/arimees/pood/pildid/tugitool.png
diff --git a/rannak/mangud/arimees/pood/script.js b/rannak/mangud/arimees/pood/script.js
index 3b3e67b..3b3e67b 100644..100755
--- a/rannak/mangud/arimees/pood/script.js
+++ b/rannak/mangud/arimees/pood/script.js
diff --git a/rannak/mangud/arimees/pood/styles.css b/rannak/mangud/arimees/pood/styles.css
index 58bc290..58bc290 100644..100755
--- a/rannak/mangud/arimees/pood/styles.css
+++ b/rannak/mangud/arimees/pood/styles.css
diff --git a/rannak/mangud/arimees/soome/fonts/OFL.txt b/rannak/mangud/arimees/soome/fonts/OFL.txt
index cdb3773..cdb3773 100644..100755
--- a/rannak/mangud/arimees/soome/fonts/OFL.txt
+++ b/rannak/mangud/arimees/soome/fonts/OFL.txt
diff --git a/rannak/mangud/arimees/soome/fonts/README.txt b/rannak/mangud/arimees/soome/fonts/README.txt
index c5792a2..c5792a2 100644..100755
--- a/rannak/mangud/arimees/soome/fonts/README.txt
+++ b/rannak/mangud/arimees/soome/fonts/README.txt
diff --git a/rannak/mangud/arimees/soome/fonts/Rubik-Italic-VariableFont_wght.ttf b/rannak/mangud/arimees/soome/fonts/Rubik-Italic-VariableFont_wght.ttf
index 58d5f50..58d5f50 100644..100755
--- a/rannak/mangud/arimees/soome/fonts/Rubik-Italic-VariableFont_wght.ttf
+++ b/rannak/mangud/arimees/soome/fonts/Rubik-Italic-VariableFont_wght.ttf
diff --git a/rannak/mangud/arimees/soome/fonts/Rubik-VariableFont_wght.ttf b/rannak/mangud/arimees/soome/fonts/Rubik-VariableFont_wght.ttf
index fa161b9..fa161b9 100644..100755
--- a/rannak/mangud/arimees/soome/fonts/Rubik-VariableFont_wght.ttf
+++ b/rannak/mangud/arimees/soome/fonts/Rubik-VariableFont_wght.ttf
diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-Black.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-Black.ttf
index 1613299..1613299 100644..100755
--- a/rannak/mangud/arimees/soome/fonts/static/Rubik-Black.ttf
+++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-Black.ttf
diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-BlackItalic.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-BlackItalic.ttf
index fc12676..fc12676 100644..100755
--- a/rannak/mangud/arimees/soome/fonts/static/Rubik-BlackItalic.ttf
+++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-BlackItalic.ttf
diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-Bold.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-Bold.ttf
index 7ec66a6..7ec66a6 100644..100755
--- a/rannak/mangud/arimees/soome/fonts/static/Rubik-Bold.ttf
+++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-Bold.ttf
diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-BoldItalic.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-BoldItalic.ttf
index f6e0780..f6e0780 100644..100755
--- a/rannak/mangud/arimees/soome/fonts/static/Rubik-BoldItalic.ttf
+++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-BoldItalic.ttf
diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-ExtraBold.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-ExtraBold.ttf
index 1ca9932..1ca9932 100644..100755
--- a/rannak/mangud/arimees/soome/fonts/static/Rubik-ExtraBold.ttf
+++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-ExtraBold.ttf
diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-ExtraBoldItalic.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-ExtraBoldItalic.ttf
index 598f72a..598f72a 100644..100755
--- a/rannak/mangud/arimees/soome/fonts/static/Rubik-ExtraBoldItalic.ttf
+++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-ExtraBoldItalic.ttf
diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-Italic.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-Italic.ttf
index 0c6d991..0c6d991 100644..100755
--- a/rannak/mangud/arimees/soome/fonts/static/Rubik-Italic.ttf
+++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-Italic.ttf
diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-Light.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-Light.ttf
index 9229768..9229768 100644..100755
--- a/rannak/mangud/arimees/soome/fonts/static/Rubik-Light.ttf
+++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-Light.ttf
diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-LightItalic.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-LightItalic.ttf
index d3bba74..d3bba74 100644..100755
--- a/rannak/mangud/arimees/soome/fonts/static/Rubik-LightItalic.ttf
+++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-LightItalic.ttf
diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-Medium.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-Medium.ttf
index 0895d3e..0895d3e 100644..100755
--- a/rannak/mangud/arimees/soome/fonts/static/Rubik-Medium.ttf
+++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-Medium.ttf
diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-MediumItalic.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-MediumItalic.ttf
index e839613..e839613 100644..100755
--- a/rannak/mangud/arimees/soome/fonts/static/Rubik-MediumItalic.ttf
+++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-MediumItalic.ttf
diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-Regular.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-Regular.ttf
index 0967c8c..0967c8c 100644..100755
--- a/rannak/mangud/arimees/soome/fonts/static/Rubik-Regular.ttf
+++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-Regular.ttf
diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-SemiBold.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-SemiBold.ttf
index b631487..b631487 100644..100755
--- a/rannak/mangud/arimees/soome/fonts/static/Rubik-SemiBold.ttf
+++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-SemiBold.ttf
diff --git a/rannak/mangud/arimees/soome/fonts/static/Rubik-SemiBoldItalic.ttf b/rannak/mangud/arimees/soome/fonts/static/Rubik-SemiBoldItalic.ttf
index f9eb73b..f9eb73b 100644..100755
--- a/rannak/mangud/arimees/soome/fonts/static/Rubik-SemiBoldItalic.ttf
+++ b/rannak/mangud/arimees/soome/fonts/static/Rubik-SemiBoldItalic.ttf
diff --git a/rannak/mangud/arimees/soome/index.html b/rannak/mangud/arimees/soome/index.html
index f178d55..9b14e25 100644..100755
--- a/rannak/mangud/arimees/soome/index.html
+++ b/rannak/mangud/arimees/soome/index.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1" />
 
-  <title>Soome</title>
+  <title>Õpime soome keelt</title>
   <!-- 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">
 
@@ -20,10 +20,12 @@
     </button>
 
     <div class="container text-white text-center">
-	  <h1>Soome</h1>
+	  <h1>Õpime soome keelt</h1>
 
 	  <p>
         Leia sõnastikust soomekeelsetele sõnadele vasted ja asenda need kirja.
+        <br/>
+        PS: Pane sõnad ka õigesse käändesse.
       </p>
 
 	  <div class="text-center">
@@ -94,7 +96,6 @@
 
 
       <div class="rightSide">
-        <h2>Kiri</h2>
 
         <p>
           <span id="Moikka" contenteditable="true">Moikka </span>
@@ -102,7 +103,7 @@
           Ma ei saa sinuga pikalt <span contenteditable="true" id="puhuda">puhuda </span>.
           <span contenteditable="true" id="Pulma">Pulma </span> on
           selles, et kiirustan  laevale, sõidan Helsingisse <span contenteditable="true" id="ostoksille">ostoksille </span>,
-          sealt saab <span contenteditable="true" id="halba">halba </span> kraami! Kuluvaid on kindlasti juurde vaja ja
+          sealt saab <span contenteditable="true" id="halba">halba </span> kraami! Kuluvaid on kindlasti juurde vaja
           <span contenteditable="true" id="pibod">pibod </span> ning <span contenteditable="true" id="Tpaitad">T-paitad </span>
           lähevad ka hästi kaubaks.
           Eelmisest korrast on veel mõned <span contenteditable="true" id="puserod">puserod </span>,
diff --git a/rannak/mangud/arimees/soome/pildid/avatar.png b/rannak/mangud/arimees/soome/pildid/avatar.png
index 3cb21cf..3cb21cf 100644..100755
--- a/rannak/mangud/arimees/soome/pildid/avatar.png
+++ b/rannak/mangud/arimees/soome/pildid/avatar.png
diff --git a/rannak/mangud/arimees/soome/script.js b/rannak/mangud/arimees/soome/script.js
index 25ffedd..946f029 100644..100755
--- a/rannak/mangud/arimees/soome/script.js
+++ b/rannak/mangud/arimees/soome/script.js
@@ -10,7 +10,7 @@ map["puhuda"] = "rääkida";
 map["Pulma"] = "probleem";
 map["ostoksille"] = "ostlema";
 map["halba"] = "odavat";
-map["pibod"] = "kootudsuusamütsid";
+map["pibod"] = "kootudsuusamütse";
 map["Tpaitad"] = "t-särgid";
 //map["kesähousut"] = "t-särgid";
 map["puserod"] = "sametistdressipluusid"
diff --git a/rannak/mangud/arimees/soome/style.css b/rannak/mangud/arimees/soome/style.css
index 5912b9b..5912b9b 100644..100755
--- a/rannak/mangud/arimees/soome/style.css
+++ b/rannak/mangud/arimees/soome/style.css
author	Rasmus <rasmus.luha@gmail.com>	2023-03-10 19:09:53 +0200
committer	Rasmus <rasmus.luha@gmail.com>	2023-03-10 19:09:53 +0200
commit	f05f15dbe108e3fd10af8d15fb15c1b27e689f96 (patch)
tree	5f6d888bbf5f2dbce5a21df15323c3f8e143b19b /rannak/mangud/arimees
parent	c525b29ceb91c0abacfe9916aafb1b0b48d47880 (diff)