added Muusika and Kuulamine

38 files changed, 42 insertions, 21 deletions

diff --git a/lehed/oppematerjalid/index.html b/lehed/oppematerjalid/index.html
index f8bce14..dd83513 100644..100755
--- a/lehed/oppematerjalid/index.html
+++ b/lehed/oppematerjalid/index.html
@@ -33,7 +33,7 @@
         <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="../sissejuhatus">Sissejuhatus</a>
+              <a class="nav-link" href="../projekt">Projekt</a>
             </li>
             <li class="nav-item">
               <a class="nav-link" href="../../#juhend">Juhend</a>
diff --git a/lehed/oppematerjalid/styles.css b/lehed/oppematerjalid/styles.css
index 9b02532..9b02532 100644..100755
--- a/lehed/oppematerjalid/styles.css
+++ b/lehed/oppematerjalid/styles.css
diff --git a/lehed/sissejuhatus/index.html b/lehed/projekt/index.html
index 8817d49..84f8a6a 100644..100755
--- a/lehed/sissejuhatus/index.html
+++ b/lehed/projekt/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>Sissejuhatus</title>
+    <title>Projekt</title>
 
     <link rel="stylesheet" href="styles.css">
     <link rel="preconnect" href="https://fonts.googleapis.com">
@@ -33,7 +33,7 @@
         <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="../sissejuhatus">Sissejuhatus</a>
+              <a class="nav-link" href="../projekt">Projekt</a>
             </li>
             <li class="nav-item">
               <a class="nav-link" href="../../#juhend">Juhend</a>
@@ -54,12 +54,7 @@
 
     <!-- Sissejuhatus -->
     <section id="sissejuhatus">
-        <h1 class="text-center text-white pb-3">Sissejuhatus</h1>
-        <div class="container justify-content-center mb-5">
-            <video class="w-100" controls >
-                <source src="videos/video.mp4" type="video/mp4" />
-            </video>
-        </div>
+        <h1 class="text-center text-white pb-3">Projekt</h1>
     </section>
 
     <!-- JavaScript Bundle with Popper -->
diff --git a/lehed/sissejuhatus/styles.css b/lehed/projekt/styles.css
index 9b02532..9b02532 100644..100755
--- a/lehed/sissejuhatus/styles.css
+++ b/lehed/projekt/styles.css
diff --git a/lehed/rollid/fonts/First School.jpg b/lehed/rollid/fonts/First School.jpg
index 7157fd2..7157fd2 100644..100755
--- a/lehed/rollid/fonts/First School.jpg
+++ b/lehed/rollid/fonts/First School.jpg
diff --git a/lehed/rollid/fonts/First School.otf b/lehed/rollid/fonts/First School.otf
index 293ddbe..293ddbe 100644..100755
--- a/lehed/rollid/fonts/First School.otf
+++ b/lehed/rollid/fonts/First School.otf
diff --git a/lehed/rollid/fonts/FirstSchool.ttf b/lehed/rollid/fonts/FirstSchool.ttf
index 2a8afad..2a8afad 100644..100755
--- a/lehed/rollid/fonts/FirstSchool.ttf
+++ b/lehed/rollid/fonts/FirstSchool.ttf
diff --git a/lehed/rollid/fonts/More Info.txt b/lehed/rollid/fonts/More Info.txt
index 55a7f1d..55a7f1d 100644..100755
--- a/lehed/rollid/fonts/More Info.txt
+++ b/lehed/rollid/fonts/More Info.txt
diff --git a/lehed/rollid/fonts/Read Me.pdf b/lehed/rollid/fonts/Read Me.pdf
index ea409b5..ea409b5 100644..100755
--- a/lehed/rollid/fonts/Read Me.pdf
+++ b/lehed/rollid/fonts/Read Me.pdf
diff --git a/lehed/rollid/fonts/test/C059-BdIta.otf b/lehed/rollid/fonts/test/C059-BdIta.otf
index 0f59bb9..0f59bb9 100644..100755
--- a/lehed/rollid/fonts/test/C059-BdIta.otf
+++ b/lehed/rollid/fonts/test/C059-BdIta.otf
diff --git a/lehed/rollid/fonts/test/C059-BdIta.ttf b/lehed/rollid/fonts/test/C059-BdIta.ttf
index af93623..af93623 100644..100755
--- a/lehed/rollid/fonts/test/C059-BdIta.ttf
+++ b/lehed/rollid/fonts/test/C059-BdIta.ttf
diff --git a/lehed/rollid/fonts/test/C059-Bold.otf b/lehed/rollid/fonts/test/C059-Bold.otf
index f8718a8..f8718a8 100644..100755
--- a/lehed/rollid/fonts/test/C059-Bold.otf
+++ b/lehed/rollid/fonts/test/C059-Bold.otf
diff --git a/lehed/rollid/fonts/test/C059-Bold.ttf b/lehed/rollid/fonts/test/C059-Bold.ttf
index 3735d83..3735d83 100644..100755
--- a/lehed/rollid/fonts/test/C059-Bold.ttf
+++ b/lehed/rollid/fonts/test/C059-Bold.ttf
diff --git a/lehed/rollid/fonts/test/C059-Italic.otf b/lehed/rollid/fonts/test/C059-Italic.otf
index 4abe846..4abe846 100644..100755
--- a/lehed/rollid/fonts/test/C059-Italic.otf
+++ b/lehed/rollid/fonts/test/C059-Italic.otf
diff --git a/lehed/rollid/fonts/test/C059-Italic.ttf b/lehed/rollid/fonts/test/C059-Italic.ttf
index 3c8197f..3c8197f 100644..100755
--- a/lehed/rollid/fonts/test/C059-Italic.ttf
+++ b/lehed/rollid/fonts/test/C059-Italic.ttf
diff --git a/lehed/rollid/fonts/test/C059-Roman.otf b/lehed/rollid/fonts/test/C059-Roman.otf
index fcd5e4c..fcd5e4c 100644..100755
--- a/lehed/rollid/fonts/test/C059-Roman.otf
+++ b/lehed/rollid/fonts/test/C059-Roman.otf
diff --git a/lehed/rollid/fonts/test/C059-Roman.ttf b/lehed/rollid/fonts/test/C059-Roman.ttf
index 7368c2e..7368c2e 100644..100755
--- a/lehed/rollid/fonts/test/C059-Roman.ttf
+++ b/lehed/rollid/fonts/test/C059-Roman.ttf
diff --git a/lehed/rollid/fonts/test/LICENSE.OFL b/lehed/rollid/fonts/test/LICENSE.OFL
index b620245..b620245 100644..100755
--- a/lehed/rollid/fonts/test/LICENSE.OFL
+++ b/lehed/rollid/fonts/test/LICENSE.OFL
diff --git a/lehed/rollid/fonts/test/LICENSE.md b/lehed/rollid/fonts/test/LICENSE.md
index 79f7698..79f7698 100644..100755
--- a/lehed/rollid/fonts/test/LICENSE.md
+++ b/lehed/rollid/fonts/test/LICENSE.md
diff --git a/lehed/rollid/fonts/test/README.md b/lehed/rollid/fonts/test/README.md
index 4c14ad7..4c14ad7 100644..100755
--- a/lehed/rollid/fonts/test/README.md
+++ b/lehed/rollid/fonts/test/README.md
diff --git a/lehed/rollid/fonts/test/new-century-schoolbook.zip b/lehed/rollid/fonts/test/new-century-schoolbook.zip
index 58bc3ab..58bc3ab 100644..100755
--- a/lehed/rollid/fonts/test/new-century-schoolbook.zip
+++ b/lehed/rollid/fonts/test/new-century-schoolbook.zip
diff --git a/lehed/rollid/index.html b/lehed/rollid/index.html
index d051fea..0a53683 100644..100755
--- a/lehed/rollid/index.html
+++ b/lehed/rollid/index.html
@@ -35,7 +35,7 @@
         <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="../sissejuhatus">Sissejuhatus</a>
+              <a class="nav-link" href="../projekt">Projekt</a>
             </li>
             <li class="nav-item">
               <a class="nav-link" href="../../#juhend">Juhend</a>
@@ -69,10 +69,6 @@
               Üliõpilane
             </button>
     
-            <button class="nav-link" id="nav-partorg-tab" data-bs-toggle="tab" data-bs-target="#nav-partorg" type="button" role="tab" aria-controls="nav-partorg" aria-selected="false">
-              Partorg
-            </button>
-    
             <button class="nav-link" id="nav-arimees-tab" data-bs-toggle="tab" data-bs-target="#nav-arimees" type="button" role="tab" aria-controls="nav-arimees" aria-selected="false">
               Ärimees
             </button>
@@ -80,13 +76,17 @@
             <button class="nav-link" id="nav-perenaine-tab" data-bs-toggle="tab" data-bs-target="#nav-perenaine" type="button" role="tab" aria-controls="nav-perenaine" aria-selected="false">
               Perenaine
             </button>
+
+            <button class="nav-link" id="nav-partorg-tab" data-bs-toggle="tab" data-bs-target="#nav-partorg" type="button" role="tab" aria-controls="nav-partorg" aria-selected="false">
+              Partorg
+            </button>
     
             <button class="nav-link" id="nav-kaitseliitlane-tab" data-bs-toggle="tab" data-bs-target="#nav-kaitseliitlane" type="button" role="tab" aria-controls="nav-kaitseliitlane" aria-selected="false">
               Kaitseliitlane
             </button>
 
             <button class="nav-link" id="nav-direktor-tab" data-bs-toggle="tab" data-bs-target="#nav-direktor" type="button" role="tab" aria-controls="nav-direktor" aria-selected="false">
-              Kooli Direktor
+              Koolidirektor
             </button>
 
           </div>
@@ -98,7 +98,7 @@
           <div class="tab-pane fade show active p-3 text-white" id="nav-opilane" role="tabpanel" aria-labelledby="nav-opilane-tab">
             <div class="row">
               <div>
-                <h2>TÕNU, üliõpilane. Sündinud 1969, 22-aastane</h2>
+                <h2 class="uliopilanePealkiri">TÕNU, üliõpilane. Sündinud 1969, 22-aastane</h2>
 
                 <video controls >
                   <source src="vids/uliopilane.mp4" type="video/mp4" />
@@ -134,7 +134,7 @@
           <div class="tab-pane fade p-3 text-white" id="nav-partorg" role="tabpanel" aria-labelledby="nav-partorg-tab">
             <div class="row">
               <div>
-                <h2>MARIA, partorg. Sündinud 1933, 58-aastane</h2>
+                <h2 class="partorgPealkiri">MARIA, partorg. Sündinud 1933, 58-aastane</h2>
 
                 <video controls >
                   <source src="vids/partorg.mp4" type="video/mp4" />
@@ -179,7 +179,7 @@
           <div class="tab-pane fade p-3 text-white" id="nav-arimees" role="tabpanel" aria-labelledby="nav-arimees-tab">
             <div class="row">
               <div class="col-lg-8">
-                <h2>Ärimees</h2>
+                <h2 class="arimeesPealkiri">Ärimees</h2>
                 <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Distinctio provident corporis aut, ipsa tenetur vel illo excepturi voluptate molestiae magnam, totam est id alias dicta a assumenda corrupti et repellat.</p>
                 <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Distinctio provident corporis aut, ipsa tenetur vel illo excepturi voluptate molestiae magnam, totam est id alias dicta a assumenda corrupti et repellat.</p>
               </div>
@@ -193,7 +193,7 @@
           <div class="tab-pane fade p-3 text-white" id="nav-perenaine" role="tabpanel" aria-labelledby="nav-perenaine-tab">
             <div class="row">
               <div>
-                <h2>VIRGE, apteeker. Sündinud 1955, 35-aastane</h2>
+                <h2 class="perenainePealkiri">VIRGE, Perenaine. Sündinud 1955, 35-aastane</h2>
 
                 <video controls >
                   <source src="vids/perenaine.mp4" type="video/mp4" />
@@ -228,7 +228,7 @@
           <div class="tab-pane fade p-3 text-white" id="nav-kaitseliitlane" role="tabpanel" aria-labelledby="nav-kaitseliitlane-tab">
             <div class="row">
               <div class="col-lg-8">
-                <h2>Kaitseliitlane</h2>
+                <h2 class="kaitseliitlanePealkiri">Kaitseliitlane</h2>
                 <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Distinctio provident corporis aut, ipsa tenetur vel illo excepturi voluptate molestiae magnam, totam est id alias dicta a assumenda corrupti et repellat.</p>
                 <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Distinctio provident corporis aut, ipsa tenetur vel illo excepturi voluptate molestiae magnam, totam est id alias dicta a assumenda corrupti et repellat.</p>
                 <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Distinctio provident corporis aut, ipsa tenetur vel illo excepturi voluptate molestiae magnam, totam est id alias dicta a assumenda corrupti et repellat.</p>
@@ -244,7 +244,7 @@
           <div class="tab-pane fade p-3 text-white" id="nav-direktor" role="tabpanel" aria-labelledby="nav-direktor-tab">
             <div class="row">
               <div>
-                <h2>ELLE, koolidirektor. Sündinud 1948, 43-aastane</h2>
+                <h2 class="direktorPealkiri">ELLE, koolidirektor. Sündinud 1948, 43-aastane</h2>
 
                 <video controls >
                   <source src="vids/direktor.mp4" type="video/mp4" />
diff --git a/lehed/rollid/pildid/arimees.jpg b/lehed/rollid/pildid/arimees.jpg
index 3cb21cf..3cb21cf 100644..100755
--- a/lehed/rollid/pildid/arimees.jpg
+++ b/lehed/rollid/pildid/arimees.jpg
diff --git a/lehed/rollid/pildid/direktor.jpg b/lehed/rollid/pildid/direktor.jpg
index 74f2cf5..74f2cf5 100644..100755
--- a/lehed/rollid/pildid/direktor.jpg
+++ b/lehed/rollid/pildid/direktor.jpg
diff --git a/lehed/rollid/pildid/kaitseliitlane.jpg b/lehed/rollid/pildid/kaitseliitlane.jpg
index 37ae271..37ae271 100644..100755
--- a/lehed/rollid/pildid/kaitseliitlane.jpg
+++ b/lehed/rollid/pildid/kaitseliitlane.jpg
diff --git a/lehed/rollid/pildid/opilane.jpg b/lehed/rollid/pildid/opilane.jpg
index 7e42755..7e42755 100644..100755
--- a/lehed/rollid/pildid/opilane.jpg
+++ b/lehed/rollid/pildid/opilane.jpg
diff --git a/lehed/rollid/pildid/partorg.jpg b/lehed/rollid/pildid/partorg.jpg
index 2df392c..2df392c 100644..100755
--- a/lehed/rollid/pildid/partorg.jpg
+++ b/lehed/rollid/pildid/partorg.jpg
diff --git a/lehed/rollid/pildid/perenaine.jpg b/lehed/rollid/pildid/perenaine.jpg
index 94c5b54..94c5b54 100644..100755
--- a/lehed/rollid/pildid/perenaine.jpg
+++ b/lehed/rollid/pildid/perenaine.jpg
diff --git a/lehed/rollid/styles.css b/lehed/rollid/styles.css
index c0481b6..a2cc1ea 100644..100755
--- a/lehed/rollid/styles.css
+++ b/lehed/rollid/styles.css
@@ -34,6 +34,32 @@ video {
 }
 
 
+/* Pealkirjade värvid */
+
+.uliopilanePealkiri {
+    color: #4169E1;
+}
+
+.partorgPealkiri {
+    color: #a1000e;
+}
+
+.arimeesPealkiri {
+    color: #2FF924;
+}
+
+.kaitseLiitlanePealkiri {
+    color: #156734;
+}
+
+.perenainePealkiri {
+    color: #FEDD00;
+}
+
+.direktorPealkiri {
+    color: #FF7F50;
+}
+
 
 @media screen and (max-width: 888px) {
     video {
diff --git a/lehed/rollid/vids/direktor.mp4 b/lehed/rollid/vids/direktor.mp4
index c878738..c7ded51 100644..100755
--- a/lehed/rollid/vids/direktor.mp4
+++ b/lehed/rollid/vids/direktor.mp4
diff --git a/lehed/rollid/vids/partorg.mp4 b/lehed/rollid/vids/partorg.mp4
index da82768..10c43d8 100644..100755
--- a/lehed/rollid/vids/partorg.mp4
+++ b/lehed/rollid/vids/partorg.mp4
diff --git a/lehed/rollid/vids/perenaine.mp4 b/lehed/rollid/vids/perenaine.mp4
index fa66536..acf785a 100644..100755
--- a/lehed/rollid/vids/perenaine.mp4
+++ b/lehed/rollid/vids/perenaine.mp4
diff --git a/lehed/rollid/vids/screens/direktor.jpg b/lehed/rollid/vids/screens/direktor.jpg
index b89268d..b89268d 100644..100755
--- a/lehed/rollid/vids/screens/direktor.jpg
+++ b/lehed/rollid/vids/screens/direktor.jpg
diff --git a/lehed/rollid/vids/screens/partorg.jpg b/lehed/rollid/vids/screens/partorg.jpg
index 53d3b8e..53d3b8e 100644..100755
--- a/lehed/rollid/vids/screens/partorg.jpg
+++ b/lehed/rollid/vids/screens/partorg.jpg
diff --git a/lehed/rollid/vids/screens/perenaine.jpg b/lehed/rollid/vids/screens/perenaine.jpg
index 481db36..481db36 100644..100755
--- a/lehed/rollid/vids/screens/perenaine.jpg
+++ b/lehed/rollid/vids/screens/perenaine.jpg
diff --git a/lehed/rollid/vids/screens/uliopilane.jpg b/lehed/rollid/vids/screens/uliopilane.jpg
index 9c4d344..9c4d344 100644..100755
--- a/lehed/rollid/vids/screens/uliopilane.jpg
+++ b/lehed/rollid/vids/screens/uliopilane.jpg
diff --git a/lehed/rollid/vids/uliopilane.mp4 b/lehed/rollid/vids/uliopilane.mp4
index 8a5c7f1..13d54f0 100644..100755
--- a/lehed/rollid/vids/uliopilane.mp4
+++ b/lehed/rollid/vids/uliopilane.mp4
diff --git a/lehed/sissejuhatus/videos/video.mp4 b/lehed/sissejuhatus/videos/video.mp4
deleted file mode 100644
index 173fb06..0000000
--- a/lehed/sissejuhatus/videos/video.mp4
+++ /dev/null