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/partorg/sonaragastik/index.html | 31 +++++------
rannak/mangud/partorg/sonaragastik/script.js | 4 +-
rannak/mangud/partorg/sonaragastik/style.css | 77 +++++++++++++++------------
3 files changed, 59 insertions(+), 53 deletions(-)
(limited to 'rannak/mangud/partorg/sonaragastik')
diff --git a/rannak/mangud/partorg/sonaragastik/index.html b/rannak/mangud/partorg/sonaragastik/index.html
index 11d31ec..be6093e 100644
--- a/rannak/mangud/partorg/sonaragastik/index.html
+++ b/rannak/mangud/partorg/sonaragastik/index.html
@@ -4,10 +4,10 @@
<meta charset="UTF-8">
<title>Sõnarägastik</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>
@@ -34,16 +34,11 @@
</div>
</div>
-
-
<!-- Button trigger modal -->
<button type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal">
Sissejuhatus
</button>
-
-
-
<!-- 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">
@@ -63,6 +58,8 @@
Meie kaasaeg ja kuulsusrikas nõukogude lähiminevik on ellu kutsunud mitmed huvitavad mõisted ja uudissõnad, kas ka teie tunnete neid?
<br/>
<strong>Leidke need mõisted ja uudissõnad sõnarägastikust.</strong>
+ <br/>
+ <strong>NB! Kontrolli sõnu ükshaaval.</strong>
</div>
@@ -107,10 +104,6 @@
<strong class="Vmaantee">MAANTEEMUHK.</strong> Väikeauto, ametliku nimega Zaporožets. ( või ZAZ 965)
</li>
- <li>
- <strong class="Vtuusik">TUUSIK</strong>. Neid jagasid töökohtade ametiühingukomiteed. Olenevalt tuusikust sai minna kas mõne vennasvabariigi puhkekodusse, sanatooriumisse või turismibaasi või näiteks turismirongiga Poola, Saksa Demokraatlikku Vabariiki vm sotsmaale.
- </li>
-
<li>
<strong class="Vplaanimajandus">PLAANIMAJANDUS.</strong> Kuna riik otsustas, kui palju mingit kaupa toodetakse,
oli asju tavaliselt kas üle (nt povidlo) või puudu (nt viinerid, defitsiit!).
@@ -135,6 +128,7 @@
<!-- Sõnarägastik -->
+ <div class="tableWrapper">
<table class="text-center text-white">
<!-- Essa Rida-->
@@ -162,7 +156,7 @@
<td></td>
<td></td>
<td class="tsaika"><span>Š</span></td>
- <td class="tuusik"><span>T</span></td>
+ <td></td>
<td></td>
<td></td>
<td></td>
@@ -181,7 +175,7 @@
<td></td>
<td class="tsaika"><span>A</span></td>
<td></td>
- <td class="tuusik"><span>U</span></td>
+ <td></td>
<td></td>
<td></td>
<td class="redis"><span>R</span></td>
@@ -200,7 +194,7 @@
<td class="letialuneKaup tsaika"><span>I</span></td>
<td class="letialuneKaup"><span>A</span></td>
<td class="letialuneKaup"><span>L</span></td>
- <td class="letialuneKaup tuusik"><span>U</span></td>
+ <td class="letialuneKaup"><span>U</span></td>
<td class="letialuneKaup"><span>N</span></td>
<td class="letialuneKaup redis"><span>E</span></td>
<td class="letialuneKaup"><span>K</span></td>
@@ -219,7 +213,7 @@
<td></td>
<td></td>
<td></td>
- <td class="tuusik"><span>S</span></td>
+ <td></td>
<td class="redis"><span>D</span></td>
<td></td>
<td class="plaanimajandus"><span>N</span></td>
@@ -238,7 +232,7 @@
<td></td>
<td></td>
<td></td>
- <td class="redis tuusik"><span>I</span></td>
+ <td class="redis"><span>I</span></td>
<td></td>
<td class="plaanimajandus"><span>I</span></td>
<td class="rubla"><span>L</span></td>
@@ -257,7 +251,7 @@
<td class="talongid"><span>I</span></td>
<td class="talongid"><span>D</span></td>
<td class="redis"><span>S</span></td>
- <td class="tuusik"><span>K</span></td>
+ <td></td>
<td class="plaanimajandus"><span>M</span></td>
<td class="rubla"><span>A</span></td>
<td></td>
@@ -390,7 +384,8 @@
</tr>
</tr>
- </table>
+</table>
+</div>
</div> <!-- End of main class-->
diff --git a/rannak/mangud/partorg/sonaragastik/script.js b/rannak/mangud/partorg/sonaragastik/script.js
index 33626b1..2e6ffb4 100644
--- a/rannak/mangud/partorg/sonaragastik/script.js
+++ b/rannak/mangud/partorg/sonaragastik/script.js
@@ -40,7 +40,7 @@ function message(msg, color){
// Main stuff
-const vastused = ["valuuta", "tuusik", "tsaika", "redis", "plaanimajandus",
+const vastused = ["valuuta", "tsaika", "redis", "plaanimajandus",
"rubla", "letialuneKaup", "talongid", "maantee",
"piiritsoon", "defitsiit"];
@@ -98,7 +98,7 @@ function proovi(){
õigedCounter++;
//console.log(õigedCounter);
}
- if (õigedCounter >= 11)
+ if (õigedCounter >= 10)
moveOnEnable();
diff --git a/rannak/mangud/partorg/sonaragastik/style.css b/rannak/mangud/partorg/sonaragastik/style.css
index 73bfa90..690ad14 100644
--- a/rannak/mangud/partorg/sonaragastik/style.css
+++ b/rannak/mangud/partorg/sonaragastik/style.css
@@ -3,7 +3,12 @@
}
body{
- background-color: #212121 !important;
+ background-color: #4D5157;
+}
+
+h1{
+ color: #a1000e;
+ font-weight: bold;
}
.moveOn{
@@ -30,14 +35,14 @@ button:disabled{
.avatar {
border-radius: 20px;
- width: 100% !important;
- max-width: 15rem !important;
+ width: 100%;
+ max-width: 15rem;
}
.modalHeaderWrapper{
text-align: center;
- margin: 0 !important;
- width: 100% !important;
+ margin: 0;
+ width: 100%;
}
@@ -53,17 +58,17 @@ button:disabled{
right: 0;
padding: 6px;
padding: 9px 25px;
- background-color: rgba(0,136,169,1) !important;
- border: none !important;
- border-radius: 50px !important;
- cursor: pointer !important;
- transition: all 0.3 ease 0 !important;
- margin: 3% !important;
- font-size: 1.2rem !important;
+ 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) !important;
+ background-color: rgba(0,136,169,0.8);
}
/* Input Box styles */
@@ -94,15 +99,15 @@ button:disabled{
/* Adding classes */
.selected {
- background-color: lime !important;
+ background-color: #ECAC76;
}
.doneV{
- background-color: #562ABF;
+ background-color: #284F8F;
}
.doneH{
- background-color: #FF0883;
+ background-color: #C5E17A;
}
.done{
@@ -115,51 +120,57 @@ button:disabled{
.main{
display: flex;
+ justify-content: center;
}
.left {
margin: 10px;
- width: calc((100vw - (14*3rem) - 10rem)/ 2) !important;
+ width: 35%;
font-size: .8rem;
+ padding: 1rem;
+ margin: 0;
}
.left strong{
font-size: 1rem;
}
+.tableWrapper {
+ width: 65%;
+}
+
table{
- margin: 10px auto;
- margin-left: 5rem;
+ margin: 10px ;
}
td {
- border: 4px solid white !important;
- width: 3.5rem !important;
+ border: 4px solid white;
+ width: 3.5rem;
font-weight: bold;
}
/*
td {
- display: block !important;
- float: left !important;
- border: 2px solid white !important;
- width: 5% !important;
- padding-bottom: 5% !important;
+ display: block;
+ float: left;
+ border: 2px solid white;
+ width: 5%;
+ padding-bottom: 5%;
}
-td span { position: absolute !important}
+td span { position: absolute}
table {
- display: block !important;
- width: 100% !important;
+ display: block;
+ width: 100%;
}
tr {
- display: block !important;
- width: 100% !important;
+ display: block;
+ width: 100%;
}
tbody {
- display: block !important;
- width: 100% !important;
+ display: block;
+ width: 100%;
}
*/
--
cgit v1.2.3