fixes

Former-commit-id: 09885e5cd344caaee9cdc2005b7e88dcc5206213

22 files changed, 286 insertions, 173 deletions

diff --git a/index.html b/index.html
index 312b90d..62e3f86 100644
--- a/index.html
+++ b/index.html
@@ -34,7 +34,7 @@
                   <a class="nav-link" href="lehed/projekt">Projekt</a>
                 </li>
                 <li class="nav-item">
-                  <a class="nav-link" href="#juhend">Juhend</a>
+                  <a class="nav-link" href="lehed/juhend">Juhend</a>
                 </li>
                 <li class="nav-item">
                   <a class="nav-link" href="lehed/oppematerjalid">Õppematerjalid</a>
@@ -51,120 +51,15 @@
         </nav>
 
 
-
-
-
         <!-- Intro ja alusta Digiränakut -->
-
         <div class="rannakuNupp">
-
             <a class="mainBtn" href="rannak/kaart" class="neon-button"><span>Rännakule</span></a>
-
         </div>
 
-
     </section>
 
 
 
-    <!-- juhend -->
-    <section id="juhend">
-        <div class="container">
-
-          <div class="juhendUpper">
-            <h2>Juhend</h2>
-          </div>
-
-
-          <!-- accordion -->
-          <div class="accordion accordion-flush justify-content-center" id="accordionFlush">
-
-            <div class="accordion-item">
-              <h2 class="accordion-header" id="flush-headingOne">
-                <button class="accordion-button collapsed text-white fs-4" type="button" data-bs-toggle="collapse" data-bs-target="#flush-collapseOne" aria-expanded="false" aria-controls="flush-collapseOne">
-                  Enne alustamist
-                </button>
-              </h2>
-              <div id="flush-collapseOne" class="accordion-collapse collapse show" aria-labelledby="flush-headingOne" data-bs-parent="#accordionFlush">
-                <div class="accordion-body">
-                  <p>
-                    Enne Rännakule asumist tutvu kindlasti 
-					<a href="lehed/rollid">rollidega</a>.
-					<br/>
-					Kahjuks ei ole digirännak telefoniga läbitav.
-				  </p>
-                  <p>
-					Lorem ipsum dolor sit amet consectetur adipisicing elit. Odit quae nesciunt vitae repellat quasi quibusdam minima? Quos dicta maxime dolore ab ex 
-					perspiciatis veritatis recusandae molestiae repellendus. Officiis fugit, cumque delectus dignissimos non repellendus quo.
-				  </p>
-                </div>
-              </div>
-            </div>
-
-            <div class="accordion-item">
-              <h2 class="accordion-header" id="flush-headingTwo">
-                <button class="accordion-button collapsed text-white fs-4" type="button" data-bs-toggle="collapse" data-bs-target="#flush-collapseTwo" aria-expanded="false" aria-controls="flush-collapseTwo">
-                  Rännaku ajal
-                </button>
-              </h2>
-              <div id="flush-collapseTwo" class="accordion-collapse collapse" aria-labelledby="flush-headingTwo" data-bs-parent="#accordionFlush">
-                <div class="accordion-body">
-                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Iste, consequatur. Aliquam ea iste assumenda vel ipsa maiores ex distinctio temporibus autem quia.
-                   Omnis ipsa tempore nihil porro qui aut magnam. Temporibus quasi quo dicta excepturi nam perferendis eum molestias accusamus.</p>
-                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
-                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
-                </div>
-              </div>
-            </div>
-
-            <div class="accordion-item">
-              <h2 class="accordion-header" id="flush-headingThree">
-                <button class="accordion-button collapsed text-white fs-4" type="button" data-bs-toggle="collapse" data-bs-target="#flush-collapseThree" aria-expanded="false" aria-controls="flush-collapseThree">
-                Lõpetamine
-                </button>
-              </h2>
-              <div id="flush-collapseThree" class="accordion-collapse collapse" aria-labelledby="flush-headingThree" data-bs-parent="#accordionFlush">
-                <div class="accordion-body">
-                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
-                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
-                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
-                </div>
-            </div>
-
-            <div class="accordion-item">
-              <h2 class="accordion-header" id="flush-headingFour">
-                <button class="accordion-button collapsed text-white fs-4" type="button" data-bs-toggle="collapse" data-bs-target="#flush-collapseFour" aria-expanded="false" aria-controls="flush-collapseFour">
-                  Lisaks veel
-                </button>
-              </h2>
-              <div id="flush-collapseFour" class="accordion-collapse collapse" aria-labelledby="flush-headingFour" data-bs-parent="#accordionFlush">
-                <div class="accordion-body">
-                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
-                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
-                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
-                </div>
-              </div>
-            </div>
-
-            <div class="accordion-item">
-              <h2 class="accordion-header" id="flush-headingFive">
-                <button class="accordion-button collapsed text-white fs-4" type="button" data-bs-toggle="collapse" data-bs-target="#flush-collapseFive" aria-expanded="false" aria-controls="flush-collapseFive">
-                  Viimane Reegel
-                </button>
-              </h2>
-              <div id="flush-collapseFive" class="accordion-collapse collapse" aria-labelledby="flush-headingFive" data-bs-parent="#accordionFlush">
-                <div class="accordion-body">
-                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
-                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
-                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
-                </div>
-              </div>
-            </div>
-
-
-          </div>
-        </div>
-    </section>
 
 
     <script src="main.js"></script>
diff --git a/lehed/juhend/index.html b/lehed/juhend/index.html
new file mode 100644
index 0000000..47dd207
--- /dev/null
+++ b/lehed/juhend/index.html
@@ -0,0 +1,164 @@
+<html lang="en">
+<head>
+    <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>Juhend</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="styles.css">
+</head>
+<body>
+
+    <!-- navbar -->
+    <nav class="navbar navbar-expand-md">
+      <div class="container fs-5">
+        <!-- navbar brand / title -->
+        <a class="navbar-brand" href="../../#intro">
+          <span class="text-secondary fw-bold">
+          Digirännak
+          </span>
+        </a>
+        <!-- toggle button for mobile nav -->
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#main-nav" aria-controls="main-nav" aria-expanded="false" aria-label="Toggle navigation">
+          <span class="navbar-toggler-icon"></span>
+        </button>
+
+        <!-- navbar links -->
+        <div class="collapse navbar-collapse justify-content-end align-center" id="main-nav">
+          <ul class="navbar-nav">
+            <li class="nav-item">
+              <a class="nav-link" href="../projekt">Projekt</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" href="../juhend">Juhend</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" href="../oppematerjalid">Õppematerjalid</a>
+            </li>
+            <li class="nav-item d-md-none">
+              <a class="nav-link" href="../rollid">Rollid</a>
+            </li>
+            <li class="nav-item ms-2 d-none d-md-inline">
+              <a class="btn btn-secondary" href="../rollid">Rollid</a>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </nav>
+
+    <!-- Sissejuhatus -->
+    <section id="sissejuhatus">
+        <h1 class="text-center text-white pb-3">Juhend</h1>
+    </section>
+
+
+    <!-- juhend -->
+    <section id="juhend">
+        <div class="container">
+
+
+          <!-- accordion -->
+          <div class="accordion accordion-flush justify-content-center" id="accordionFlush">
+
+            <div class="accordion-item">
+              <h2 class="accordion-header" id="flush-headingOne">
+                <button class="accordion-button collapsed text-white fs-4" type="button" data-bs-toggle="collapse" data-bs-target="#flush-collapseOne" aria-expanded="false" aria-controls="flush-collapseOne">
+                  Enne alustamist
+                </button>
+              </h2>
+              <div id="flush-collapseOne" class="accordion-collapse collapse show" aria-labelledby="flush-headingOne" data-bs-parent="#accordionFlush">
+                <div class="accordion-body">
+                  <p>
+                    Enne Rännakule asumist tutvu kindlasti 
+					<a href="lehed/rollid">rollidega</a>.
+					<br/>
+					Kahjuks ei ole digirännak telefoniga läbitav.
+				  </p>
+                  <p>
+					Lorem ipsum dolor sit amet consectetur adipisicing elit. Odit quae nesciunt vitae repellat quasi quibusdam minima? Quos dicta maxime dolore ab ex 
+					perspiciatis veritatis recusandae molestiae repellendus. Officiis fugit, cumque delectus dignissimos non repellendus quo.
+				  </p>
+                </div>
+              </div>
+            </div>
+
+            <div class="accordion-item">
+              <h2 class="accordion-header" id="flush-headingTwo">
+                <button class="accordion-button collapsed text-white fs-4" type="button" data-bs-toggle="collapse" data-bs-target="#flush-collapseTwo" aria-expanded="false" aria-controls="flush-collapseTwo">
+                  Rännaku ajal
+                </button>
+              </h2>
+              <div id="flush-collapseTwo" class="accordion-collapse collapse" aria-labelledby="flush-headingTwo" data-bs-parent="#accordionFlush">
+                <div class="accordion-body">
+                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Iste, consequatur. Aliquam ea iste assumenda vel ipsa maiores ex distinctio temporibus autem quia.
+                   Omnis ipsa tempore nihil porro qui aut magnam. Temporibus quasi quo dicta excepturi nam perferendis eum molestias accusamus.</p>
+                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
+                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
+                </div>
+              </div>
+            </div>
+
+            <div class="accordion-item">
+              <h2 class="accordion-header" id="flush-headingThree">
+                <button class="accordion-button collapsed text-white fs-4" type="button" data-bs-toggle="collapse" data-bs-target="#flush-collapseThree" aria-expanded="false" aria-controls="flush-collapseThree">
+                Lõpetamine
+                </button>
+              </h2>
+              <div id="flush-collapseThree" class="accordion-collapse collapse" aria-labelledby="flush-headingThree" data-bs-parent="#accordionFlush">
+                <div class="accordion-body">
+                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
+                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
+                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
+                </div>
+            </div>
+
+            <div class="accordion-item">
+              <h2 class="accordion-header" id="flush-headingFour">
+                <button class="accordion-button collapsed text-white fs-4" type="button" data-bs-toggle="collapse" data-bs-target="#flush-collapseFour" aria-expanded="false" aria-controls="flush-collapseFour">
+                  Lisaks veel
+                </button>
+              </h2>
+              <div id="flush-collapseFour" class="accordion-collapse collapse" aria-labelledby="flush-headingFour" data-bs-parent="#accordionFlush">
+                <div class="accordion-body">
+                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
+                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
+                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
+                </div>
+              </div>
+            </div>
+
+            <div class="accordion-item">
+              <h2 class="accordion-header" id="flush-headingFive">
+                <button class="accordion-button collapsed text-white fs-4" type="button" data-bs-toggle="collapse" data-bs-target="#flush-collapseFive" aria-expanded="false" aria-controls="flush-collapseFive">
+                  Viimane Reegel
+                </button>
+              </h2>
+              <div id="flush-collapseFive" class="accordion-collapse collapse" aria-labelledby="flush-headingFive" data-bs-parent="#accordionFlush">
+                <div class="accordion-body">
+                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
+                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
+                <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt ut provident delectus vel nemo eveniet ad saepe nobis sequi debitis?</p>
+                </div>
+              </div>
+            </div>
+
+
+          </div>
+        </div>
+    </section>
+
+
+
+
+
+
+
+
+
+
+    <!-- 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/lehed/juhend/styles.css b/lehed/juhend/styles.css
new file mode 100644
index 0000000..e19b377
--- /dev/null
+++ b/lehed/juhend/styles.css
@@ -0,0 +1,38 @@
+body{
+    background-color: #43464b;
+    font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+}
+
+
+/* NavBar */
+.navbar{
+    margin: 1.2rem;
+    margin-top: 0;
+    border-bottom: 2px solid white;
+}
+
+.navbar span{
+    font-weight: bold !important;
+    color: white !important;
+}
+
+.navbar a:hover{
+    color: snow;
+    font-weight: bolder;
+}
+.navbar a{ color: white; }
+
+
+
+
+
+
+
+
+
+/* Accordion */
+.accordion-item, .accordion-header, .accordion-button{
+  background-color: transparent !important;
+  border: none !important;
+  text-decoration: none !important;
+}
diff --git a/lehed/oppematerjalid/index.html b/lehed/oppematerjalid/index.html
index 1a077a6..88b01df 100644
--- a/lehed/oppematerjalid/index.html
+++ b/lehed/oppematerjalid/index.html
@@ -32,7 +32,7 @@
               <a class="nav-link" href="../projekt">Projekt</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="../../#juhend">Juhend</a>
+              <a class="nav-link" href="../juhend">Juhend</a>
             </li>
             <li class="nav-item">
               <a class="nav-link" href="../oppematerjalid">Õppematerjalid</a>
@@ -53,6 +53,16 @@
         <div class="container justify-content-center">
             <h1 class="text-center text-white">Õppematerjalid</h1>
         </div>
+        <div class="lingid">
+
+            <a class="link" target="_blank" href="https://pillerohtla.wixsite.com/ajarannak">
+                <h3 class="opilane">Õpilane</h3>
+            </a>
+
+            <a class="link" target="_blank" href="https://pillva.wixsite.com/ajarannak1991/">
+                <h3 class="opetaja">Õpetaja</h3>
+            </a>
+        </div>
     </section>
 
     <!-- JavaScript Bundle with Popper -->
diff --git a/lehed/oppematerjalid/styles.css b/lehed/oppematerjalid/styles.css
index 74ca032..987edbd 100644
--- a/lehed/oppematerjalid/styles.css
+++ b/lehed/oppematerjalid/styles.css
@@ -1,6 +1,7 @@
 body{
     font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
     background-color: #43464b;
+    max-height: 100vh !important;
 }
 
 /* NavBar */
@@ -20,3 +21,40 @@ body{
     font-weight: bolder;
 }
 .navbar a{ color: white; }
+
+
+/* Lingid */
+.lingid {
+    height: 70%;
+    display: flex;
+    align-items: center ;
+    justify-content: center;
+}
+
+.link{
+    text-decoration: none;
+    margin: 4rem;
+}
+
+h3{ 
+    font-size: 3.7rem; 
+    font-weight: 555; 
+}
+
+.opilane{color: #a3be8c}
+.opetaja{color: #d08770}
+
+
+.opilane:hover{
+    color: #a3be8c;
+    font-weight: bold;
+    font-weight: 3.8rem;
+}
+.opetaja:hover{
+    color: #d08770;
+    font-weight: bold;
+    font-weight: 3.8rem;
+}
+
+
+
diff --git a/lehed/projekt/index.html b/lehed/projekt/index.html
index 4a9da9e..3b7ff05 100644
--- a/lehed/projekt/index.html
+++ b/lehed/projekt/index.html
@@ -32,7 +32,7 @@
               <a class="nav-link" href="../projekt">Projekt</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="../../#juhend">Juhend</a>
+              <a class="nav-link" href="../juhend">Juhend</a>
             </li>
             <li class="nav-item">
               <a class="nav-link" href="../oppematerjalid">Õppematerjalid</a>
diff --git a/lehed/rollid/index.html b/lehed/rollid/index.html
index be810bf..a764e16 100644
--- a/lehed/rollid/index.html
+++ b/lehed/rollid/index.html
@@ -34,7 +34,7 @@
               <a class="nav-link" href="../projekt">Projekt</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="../../#juhend">Juhend</a>
+              <a class="nav-link" href="../juhend">Juhend</a>
             </li>
             <li class="nav-item">
               <a class="nav-link" href="../oppematerjalid">Õppematerjalid</a>
diff --git a/rannak/mangud/arimees/pood/index.html b/rannak/mangud/arimees/pood/index.html
index 16233d2..2e72724 100644
--- a/rannak/mangud/arimees/pood/index.html
+++ b/rannak/mangud/arimees/pood/index.html
@@ -256,70 +256,70 @@
             <td></td>
             <td></td>
             <td></td>
-            <td></td>
+            <td class="summa"></td>
           </tr>
           <tr>
             <td></td>
             <td></td>
             <td></td>
             <td></td>
-            <td></td>
+            <td class="summa"></td>
           </tr>
           <tr>
             <td></td>
             <td></td>
             <td></td>
             <td></td>
-            <td></td>
+            <td class="summa"></td>
           </tr>
           <tr>
             <td></td>
             <td></td>
             <td></td>
             <td></td>
-            <td></td>
+            <td class="summa"></td>
           </tr>
           <tr>
             <td></td>
             <td></td>
             <td></td>
             <td></td>
-            <td></td>
+            <td class="summa"></td>
           </tr>
           <tr>
             <td></td>
             <td></td>
             <td></td>
             <td></td>
-            <td></td>
+            <td class="summa"></td>
           </tr>
           <tr>
             <td></td>
             <td></td>
             <td></td>
             <td></td>
-            <td></td>
+            <td class="summa"></td>
           </tr>
           <tr>
             <td></td>
             <td></td>
             <td></td>
             <td></td>
-            <td></td>
+            <td class="summa"></td>
           </tr>
           <tr>
             <td></td>
             <td></td>
             <td></td>
             <td></td>
-            <td></td>
+            <td class="summa"></td>
           </tr>
           <tr>
             <td></td>
             <td></td>
             <td></td>
             <td></td>
-            <td></td>
+            <td class="summa"></td>
           </tr>
         </table> 
 
diff --git a/rannak/mangud/arimees/pood/script.js b/rannak/mangud/arimees/pood/script.js
index 20efbe8..985255e 100644
--- a/rannak/mangud/arimees/pood/script.js
+++ b/rannak/mangud/arimees/pood/script.js
@@ -35,6 +35,9 @@ for (let i=0;i < cells.length; i++){
             let origText = input.parentElement.getAttribute('data-text');
             let curText = this.value;
 
+            sums = document.querySelectorAll(".summa");
+            console.log(sums);
+
             if (origText != curText){
                 td.removeAttribute('data-clicked');
                 td.removeAttribute('data-text');
@@ -42,26 +45,32 @@ for (let i=0;i < cells.length; i++){
                 td.style.cssText = 'padding: .5rem .5rem';
 
 
+                totalSumma = 0; 
+                sums.forEach(el => {
+                    totalSumma += Number(el.innerHTML);
+                });
                 // Can move on?
                 for (cell of cells){
-                    if (cell.textContent == '')
-                        return;
+                    if (totalSumma >= 12000) 
+                        moveOnEnable();
+                    else if (cell.textContent == '')
+                            return;
                 }
                 moveOnEnable();
             }
+            
             else {
                 td.removeAttribute('data-clicked');
                 td.removeAttribute('data-text');
                 td.innerHTML = origText;
                 td.style.cssText = 'padding: .5rem .5rem';
-            }
 
-
-            // Here Check if Done
-            //TODO
+                sums.forEach(el => {
+                    console.log(el); 
+                });
+            }
 
 
-            
         } // onblur func end
 
 
diff --git a/rannak/mangud/partorg/plakat/img/malev.jpg b/rannak/mangud/partorg/plakat/img/malev.jpg
deleted file mode 100644
index d88d950..0000000
--- a/rannak/mangud/partorg/plakat/img/malev.jpg
+++ /dev/null
diff --git a/rannak/mangud/partorg/plakat/img/malev.png b/rannak/mangud/partorg/plakat/img/malev.png
new file mode 100644
index 0000000..919e667
--- /dev/null
+++ b/rannak/mangud/partorg/plakat/img/malev.png
diff --git a/rannak/mangud/partorg/plakat/img/malevBlank.png b/rannak/mangud/partorg/plakat/img/malevBlank.png
index 85c10f1..b94db71 100644
--- a/rannak/mangud/partorg/plakat/img/malevBlank.png
+++ b/rannak/mangud/partorg/plakat/img/malevBlank.png
diff --git a/rannak/mangud/partorg/plakat/img/stalin.jpg b/rannak/mangud/partorg/plakat/img/stalin.jpg
deleted file mode 100644
index bc0a3a5..0000000
--- a/rannak/mangud/partorg/plakat/img/stalin.jpg
+++ /dev/null
diff --git a/rannak/mangud/partorg/plakat/img/stalin.png b/rannak/mangud/partorg/plakat/img/stalin.png
new file mode 100644
index 0000000..45cd9ef
--- /dev/null
+++ b/rannak/mangud/partorg/plakat/img/stalin.png
diff --git a/rannak/mangud/partorg/plakat/img/stalinBlank.png b/rannak/mangud/partorg/plakat/img/stalinBlank.png
index 1f5183e..348df75 100644
--- a/rannak/mangud/partorg/plakat/img/stalinBlank.png
+++ b/rannak/mangud/partorg/plakat/img/stalinBlank.png
diff --git a/rannak/mangud/partorg/plakat/img/veekogud.jpg b/rannak/mangud/partorg/plakat/img/veekogud.jpg
deleted file mode 100644
index 23f04ab..0000000
--- a/rannak/mangud/partorg/plakat/img/veekogud.jpg
+++ /dev/null
diff --git a/rannak/mangud/partorg/plakat/img/veekogud.png b/rannak/mangud/partorg/plakat/img/veekogud.png
new file mode 100644
index 0000000..0e48af9
--- /dev/null
+++ b/rannak/mangud/partorg/plakat/img/veekogud.png
diff --git a/rannak/mangud/partorg/plakat/img/veekogudBlank.png b/rannak/mangud/partorg/plakat/img/veekogudBlank.png
index 85570b1..6589adc 100644
--- a/rannak/mangud/partorg/plakat/img/veekogudBlank.png
+++ b/rannak/mangud/partorg/plakat/img/veekogudBlank.png
diff --git a/rannak/mangud/partorg/plakat/img/viisAastak.jpg b/rannak/mangud/partorg/plakat/img/viisAastak.png
index 20be6ed..c099089 100644
--- a/rannak/mangud/partorg/plakat/img/viisAastak.jpg
+++ b/rannak/mangud/partorg/plakat/img/viisAastak.png
diff --git a/rannak/mangud/partorg/plakat/img/viisAastakBlank.png b/rannak/mangud/partorg/plakat/img/viisAastakBlank.png
index fc0215c..b9a83ad 100644
--- a/rannak/mangud/partorg/plakat/img/viisAastakBlank.png
+++ b/rannak/mangud/partorg/plakat/img/viisAastakBlank.png
diff --git a/rannak/mangud/partorg/plakat/styles.css b/rannak/mangud/partorg/plakat/styles.css
index bc7ee44..0ebe5f2 100644
--- a/rannak/mangud/partorg/plakat/styles.css
+++ b/rannak/mangud/partorg/plakat/styles.css
@@ -159,7 +159,7 @@ input:disabled{
 /*Plakatid*/
 
 .stalin {
-    background: url("img/stalin.jpg") no-repeat center;
+    background: url("img/stalin.png") no-repeat center;
     background-size: 100% 100%;
     text-align: center;
     color: black;
@@ -167,7 +167,7 @@ input:disabled{
 
 
 .veekogud {
-    background: url("img/veekogud.jpg") no-repeat center;
+    background: url("img/veekogud.png") no-repeat center;
     background-size: 100% 100%;
     text-align: center;
     color: black;
@@ -175,7 +175,7 @@ input:disabled{
 
 
 .malev {
-    background: url("img/malev.jpg") no-repeat center;
+    background: url("img/malev.png") no-repeat center;
     background-size: 100% 100%;
     text-align: center;
     color: black;
@@ -183,7 +183,7 @@ input:disabled{
 
 
 .viisAastak {
-    background: url("img/viisAastak.jpg") no-repeat center;
+    background: url("img/viisAastak.png") no-repeat center;
     background-size: 100% 100%;
     text-align: center;
     color: black;
diff --git a/styles.css b/styles.css
index d7328b6..214c95c 100644
--- a/styles.css
+++ b/styles.css
@@ -3,7 +3,7 @@
 body {
   min-height: 100vh !important;
   background-color: #43464b;
-  font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+  font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto;
 }
 
 
@@ -29,6 +29,7 @@ body {
 
 
 
+
 /* Background image */
 .rannakuNupp{
     margin: .5% 1%;
@@ -68,15 +69,6 @@ body {
 }
 
 
-/* juhend */
-.juhendUpper{
-    color: white;
-    text-align: center;
-    margin: 4rem;
-    margin-bottom: 0;
-}
-
-
 /* Accordion */
 .accordion-item, .accordion-header, .accordion-button{
   background-color: transparent !important;
@@ -85,36 +77,3 @@ body {
 }
 
 
-
-
-/* Media Queries*/
-@media only screen and (max-width: 1080px) {
-  #intro{
-    margin-bottom: 25vh;
-  }
-}
-
-@media only screen and (min-width: 1080px) {
-  #intro{
-    height: 100vh !important;
-    max-height: 100vh !important;
-  }
-}
-
-
-#juhend{
-  font-family: 'Kanit', sans-serif;
-  font-size: larger !important;
-}
-
-@media only screen and (max-width: 560px) {
-  #juhend{
-    margin-bottom: 10%;
-  }
-}
-
-@media only screen and (min-width: 1080px) {
-  #juhend{
-    height: 100vh !important;
-  }
-}