summaryrefslogtreecommitdiff
path: root/rannak/mangud/partorg
diff options
context:
space:
mode:
authorRasmus <rasmus.luha@gmail.com>2023-05-05 18:37:52 +0300
committerRasmus <rasmus.luha@gmail.com>2023-05-05 18:37:52 +0300
commit8f3d2b1b6ff3cb2378a2ce5403faebaadca61c11 (patch)
treea0c25f684b13444da069da1063653caa162fe426 /rannak/mangud/partorg
parent9a4d6be0ca9cb86ef56acdbf8bcc1fe9f920a19c (diff)
Parandused
Former-commit-id: 5f3ba2029e5783e370d2a7808b5ede5448424e14
Diffstat (limited to 'rannak/mangud/partorg')
-rw-r--r--rannak/mangud/partorg/kuulsused/index.html6
-rw-r--r--rannak/mangud/partorg/kuulsused/pildid/kogan.jpgbin1615437 -> 662421 bytes
-rw-r--r--rannak/mangud/partorg/kuulsused/script.js2
-rw-r--r--rannak/mangud/partorg/plakat/index.html12
-rw-r--r--rannak/mangud/partorg/plakat/script.js2
-rw-r--r--rannak/mangud/partorg/plakat/styles.css7
-rw-r--r--rannak/mangud/partorg/sonaragastik/index.html3
-rw-r--r--rannak/mangud/partorg/sonaragastik/script.js11
-rw-r--r--rannak/mangud/partorg/sonaragastik/style.css5
9 files changed, 26 insertions, 22 deletions
diff --git a/rannak/mangud/partorg/kuulsused/index.html b/rannak/mangud/partorg/kuulsused/index.html
index 94f952e..1e1a997 100644
--- a/rannak/mangud/partorg/kuulsused/index.html
+++ b/rannak/mangud/partorg/kuulsused/index.html
@@ -3,7 +3,7 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>Olulised Isikud</title>
+ <title>Olulised isikud</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">
@@ -13,8 +13,8 @@
<body class="text-white">
<div class="container text-center text-white align-items-center pb-5">
- <h1 class="pb-1 pt-2">Olulised Isikud</h1>
- <p>Vii kokku inimese nimi ja nägu.</p>
+ <h1 class="pb-1 pt-2">Olulised isikud</h1>
+ <p>Ühenda nimi ja nägu.</p>
<div class="row">
<div>
diff --git a/rannak/mangud/partorg/kuulsused/pildid/kogan.jpg b/rannak/mangud/partorg/kuulsused/pildid/kogan.jpg
index 9c592f3..1eff647 100644
--- a/rannak/mangud/partorg/kuulsused/pildid/kogan.jpg
+++ b/rannak/mangud/partorg/kuulsused/pildid/kogan.jpg
Binary files differ
diff --git a/rannak/mangud/partorg/kuulsused/script.js b/rannak/mangud/partorg/kuulsused/script.js
index 1ab5cef..beb04d6 100644
--- a/rannak/mangud/partorg/kuulsused/script.js
+++ b/rannak/mangud/partorg/kuulsused/script.js
@@ -119,7 +119,7 @@ function checkIfAllGood(){
if (rightDone.length == 6) {
const btn = document.querySelector(".moveOn");
btn.disabled = false;
- btn.onclick = () => location.href = "../plakat";
+ btn.onclick = () => location.href = "../sonaragastik";
}
}
diff --git a/rannak/mangud/partorg/plakat/index.html b/rannak/mangud/partorg/plakat/index.html
index 0ac5e90..9dc2bac 100644
--- a/rannak/mangud/partorg/plakat/index.html
+++ b/rannak/mangud/partorg/plakat/index.html
@@ -15,9 +15,7 @@
<div class="container text-center text-white align-items-center pb-5">
<h1>Plakatid</h1>
<p>
- Leia iga plakati õige ajastu, ning muuda ka plakati teksti.
- <br>
- NB: Uut loosungit saad lisada pärast seda, kui oled valinud õige ajastu.
+ Plakati kujundamiseks määra esmalt õige ajastu ning seejärel kirjuta uus loosung
</p>
<div class="row">
@@ -76,19 +74,19 @@
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button class="nav-link active" id="nav-60ndad-tab" data-bs-toggle="tab" data-bs-target="#nav-60ndad" type="button" role="tab" aria-controls="nav-60ndad" aria-selected="true">
- Stalin
+ 1
</button>
<button class="nav-link" id="nav-70ndad-tab" data-bs-toggle="tab" data-bs-target="#nav-70ndad" type="button" role="tab" aria-controls="nav-70ndad" aria-selected="false">
- Veekogud
+ 2
</button>
<button class="nav-link" id="nav-90ndad-tab" data-bs-toggle="tab" data-bs-target="#nav-90ndad" type="button" role="tab" aria-controls="nav-90ndad" aria-selected="false">
- Viisaastak
+ 3
</button>
<button class="nav-link" id="nav-80ndad-tab" data-bs-toggle="tab" data-bs-target="#nav-80ndad" type="button" role="tab" aria-controls="nav-80ndad" aria-selected="false">
- Malev
+ 4
</button>
diff --git a/rannak/mangud/partorg/plakat/script.js b/rannak/mangud/partorg/plakat/script.js
index 7ec4b7e..7b19edd 100644
--- a/rannak/mangud/partorg/plakat/script.js
+++ b/rannak/mangud/partorg/plakat/script.js
@@ -315,5 +315,5 @@ parem.forEach(el => {
function checkIfAllGood(){
const btn = document.querySelector(".moveOn");
btn.disabled = false;
- btn.onclick = () => location.href = "";
+ btn.onclick = () => location.href = "../kuulsused";
}
diff --git a/rannak/mangud/partorg/plakat/styles.css b/rannak/mangud/partorg/plakat/styles.css
index b2405f9..bc7ee44 100644
--- a/rannak/mangud/partorg/plakat/styles.css
+++ b/rannak/mangud/partorg/plakat/styles.css
@@ -2,7 +2,7 @@
box-sizing: border-box;
}
h1 {
- color: #154734;
+ color: #a1000e;
font-weight: bold;
}
body{
@@ -161,7 +161,6 @@ input:disabled{
.stalin {
background: url("img/stalin.jpg") no-repeat center;
background-size: 100% 100%;
- font-size: 1rem;
text-align: center;
color: black;
}
@@ -170,7 +169,6 @@ input:disabled{
.veekogud {
background: url("img/veekogud.jpg") no-repeat center;
background-size: 100% 100%;
- font-size: 1rem;
text-align: center;
color: black;
}
@@ -179,7 +177,6 @@ input:disabled{
.malev {
background: url("img/malev.jpg") no-repeat center;
background-size: 100% 100%;
- font-size: 1rem;
text-align: center;
color: black;
}
@@ -188,7 +185,6 @@ input:disabled{
.viisAastak {
background: url("img/viisAastak.jpg") no-repeat center;
background-size: 100% 100%;
- font-size: 1rem;
text-align: center;
color: black;
}
@@ -199,6 +195,7 @@ input:disabled{
.addedText, .oldAddedText {
position: absolute;
+ font-size: 1.5rem;
}
diff --git a/rannak/mangud/partorg/sonaragastik/index.html b/rannak/mangud/partorg/sonaragastik/index.html
index f955058..039f79b 100644
--- a/rannak/mangud/partorg/sonaragastik/index.html
+++ b/rannak/mangud/partorg/sonaragastik/index.html
@@ -16,7 +16,8 @@
<h1>Sõnarägastik</h1>
<p>Lahenda sõnarägastik, leia üles kõik 10 sõna
<br/>
- Peale iga sõna leidmist vajuta <strong>"proovi"</strong>.
+ Peale iga sõna leidmist vajuta <strong>"proovi"</strong>
+ , et see nimekirjas lahendatuna ära märkida.
</p>
diff --git a/rannak/mangud/partorg/sonaragastik/script.js b/rannak/mangud/partorg/sonaragastik/script.js
index 2e6ffb4..e137e37 100644
--- a/rannak/mangud/partorg/sonaragastik/script.js
+++ b/rannak/mangud/partorg/sonaragastik/script.js
@@ -4,6 +4,11 @@ document.addEventListener('DOMContentLoaded', () => {
});
+// Vars
+curZindex = 1;
+
+
+
function randomLetters(){
for (let node of document.querySelectorAll("td")) {
if (node.textContent != "") continue;
@@ -84,10 +89,12 @@ function proovi(){
//console.log("hetkeKlass: ",hetkeKlass);
for (let el of dones){
- if (horisontaalis.includes(hetkeKlass))
+ if (horisontaalis.includes(hetkeKlass)){
el.classList.add("doneH");
- else
+ }
+ else{
el.classList.add("doneV");
+ }
}
//console.log(document.querySelector(".V"+hetkeKlass).classList);
diff --git a/rannak/mangud/partorg/sonaragastik/style.css b/rannak/mangud/partorg/sonaragastik/style.css
index 4b003d9..7b896aa 100644
--- a/rannak/mangud/partorg/sonaragastik/style.css
+++ b/rannak/mangud/partorg/sonaragastik/style.css
@@ -96,11 +96,12 @@ button:disabled{
/* Adding classes */
.selected {
- background-color: #ECAC76;
+ background-color: #ECAC76 !important;
}
.doneV{
- background-color: #284F8F;
+ /*background-color: #284F8F;*/
+ background-color: #C5E17A;
}
.doneH{
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 03:21:04 +0000