add Avatar to modals

29 files changed, 150 insertions, 38 deletions

diff --git a/index.html b/index.html
index 37653e8..99288ad 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="styles.css">
-    <title>Landing Page</title>
+    <title>Digirännak</title>
 
     <!-- Fonts -->
     <link rel="preconnect" href="https://fonts.googleapis.com"> 
@@ -109,7 +109,7 @@
               <div id="flush-collapseOne" class="accordion-collapse collapse show" aria-labelledby="flush-headingOne" data-bs-parent="#accordionFlush">
                 <div class="accordion-body">
                   <p>
-					<a href="lehed/rollid/">Rollie Link</a>
+					<a href="lehed/rollid">Enne Rännakule asumist tutvu kindlasti rollidega.</a>
 					<br/>
 					Kahjuks ei ole digirännak telefoniga läbitav.
 				  </p>
diff --git a/lehed/rollid/styles.css b/lehed/rollid/styles.css
index 2885825..e983f34 100644
--- a/lehed/rollid/styles.css
+++ b/lehed/rollid/styles.css
@@ -5,6 +5,7 @@
 
 body{
     font-family: 'Cormorant SC', serif !important;
+    max-width: 100% !important;
 }
 
 button{
@@ -24,3 +25,13 @@ video {
     margin-left: 20px;
     margin-bottom: 20px;
 }
+
+
+
+@media screen and (max-width: 888px) {
+    video {
+        float: none;
+        width: 100%;
+        margin-left: 0px;
+    }
+}
diff --git a/rannak/mangud/partorg/kuulsused/index.html b/rannak/mangud/partorg/kuulsused/index.html
index 221580b..4dfe755 100644
--- a/rannak/mangud/partorg/kuulsused/index.html
+++ b/rannak/mangud/partorg/kuulsused/index.html
@@ -37,10 +37,10 @@
         <div class="modal-content">
 
           <div class="modal-header">
-            <h5 class="modal-title" id="myModalLabel">Sissejuhatus</h5>
-            <button type="button" class="closeModalButton" data-bs-dismiss="modal" aria-label="Close">
-              <span aria-hidden="true">&times;</span>
-            </button>
+            <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">
diff --git a/rannak/mangud/partorg/kuulsused/pildid/avatar.png b/rannak/mangud/partorg/kuulsused/pildid/avatar.png
new file mode 100644
index 0000000..485a70c
--- /dev/null
+++ b/rannak/mangud/partorg/kuulsused/pildid/avatar.png
diff --git a/rannak/mangud/partorg/kuulsused/styles.css b/rannak/mangud/partorg/kuulsused/styles.css
index 7c8f16e..79b5177 100644
--- a/rannak/mangud/partorg/kuulsused/styles.css
+++ b/rannak/mangud/partorg/kuulsused/styles.css
@@ -6,6 +6,16 @@
     margin-bottom: 20px !important;
 }
                 
+.avatar {
+    border-radius: 20px;
+    width: 100% !important;
+}
+
+.modalHeaderWrapper{
+    text-align: center;
+    margin: 0 !important;
+    width: 100% !important;
+}
 
 .moveOn{
     display: inline-block;
diff --git a/rannak/mangud/partorg/plakat/img/avatar.png b/rannak/mangud/partorg/plakat/img/avatar.png
new file mode 100644
index 0000000..485a70c
--- /dev/null
+++ b/rannak/mangud/partorg/plakat/img/avatar.png
diff --git a/rannak/mangud/partorg/plakat/index.html b/rannak/mangud/partorg/plakat/index.html
index 9d1e89d..a15849e 100644
--- a/rannak/mangud/partorg/plakat/index.html
+++ b/rannak/mangud/partorg/plakat/index.html
@@ -68,10 +68,10 @@
         <div class="modal-content">
 
           <div class="modal-header">
-            <h5 class="modal-title" id="myModalLabel">Sissejuhatus</h5>
-            <button type="button" class="closeModalButton" data-bs-dismiss="modal" aria-label="Close">
-              <span aria-hidden="true">&times;</span>
-            </button>
+            <div class="modalHeaderWrapper">
+              <h3 class="modal-title" id="myModalLabel">Sissejuhatus</h5>
+            </div>
+            <img class="avatar" alt="avatar" src="img/avatar.png"/>
           </div>
 
           <div class="modal-body">
diff --git a/rannak/mangud/partorg/plakat/style.css b/rannak/mangud/partorg/plakat/style.css
index 8d452ad..c2ed47b 100644
--- a/rannak/mangud/partorg/plakat/style.css
+++ b/rannak/mangud/partorg/plakat/style.css
@@ -8,6 +8,17 @@ body {
 
 
 /* Move on ja Sissejuhatus Button */
+                
+.avatar {
+    border-radius: 20px;
+    width: 100% !important;
+}
+
+.modalHeaderWrapper{
+    text-align: center;
+    margin: 0 !important;
+    width: 100% !important;
+}
 
 button:disabled{
     opacity: 0.5;
diff --git a/rannak/mangud/partorg/sonaragastik/index.html b/rannak/mangud/partorg/sonaragastik/index.html
index 095c110..11d31ec 100644
--- a/rannak/mangud/partorg/sonaragastik/index.html
+++ b/rannak/mangud/partorg/sonaragastik/index.html
@@ -50,10 +50,10 @@
         <div class="modal-content">
 
           <div class="modal-header">
-            <h5 class="modal-title" id="myModalLabel">Sissejuhatus</h5>
-            <button type="button" class="closeModalButton" data-bs-dismiss="modal" aria-label="Close">
-              <span aria-hidden="true">&times;</span>
-            </button>
+            <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">
diff --git a/rannak/mangud/partorg/sonaragastik/pildid/avatar.png b/rannak/mangud/partorg/sonaragastik/pildid/avatar.png
new file mode 100644
index 0000000..485a70c
--- /dev/null
+++ b/rannak/mangud/partorg/sonaragastik/pildid/avatar.png
diff --git a/rannak/mangud/partorg/sonaragastik/style.css b/rannak/mangud/partorg/sonaragastik/style.css
index 7abfb14..a5d6004 100644
--- a/rannak/mangud/partorg/sonaragastik/style.css
+++ b/rannak/mangud/partorg/sonaragastik/style.css
@@ -28,6 +28,20 @@ button:disabled{
 
 /* Modal Stuff */
 
+.avatar {
+    border-radius: 20px;
+    width: 100% !important;
+    width: 100% !important;
+}
+
+.modalHeaderWrapper{
+    text-align: center;
+    margin: 0 !important;
+    width: 100% !important;
+}
+
+
+
 
 .closeModalButton {
   border-radius: 50px;
diff --git a/rannak/mangud/perenaine/memori/img/avatar.png b/rannak/mangud/perenaine/memori/img/avatar.png
new file mode 100644
index 0000000..60987d3
--- /dev/null
+++ b/rannak/mangud/perenaine/memori/img/avatar.png
diff --git a/rannak/mangud/perenaine/memori/index.html b/rannak/mangud/perenaine/memori/index.html
index 240a48e..c8fd288 100644
--- a/rannak/mangud/perenaine/memori/index.html
+++ b/rannak/mangud/perenaine/memori/index.html
@@ -32,10 +32,10 @@
       <div class="modal-content">
 
         <div class="modal-header">
-          <h5 class="modal-title" id="myModalLabel">Sissejuhatus</h5>
-          <button type="button" class="closeModalButton" data-bs-dismiss="modal" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
-          </button>
+            <div class="modalHeaderWrapper">
+              <h3 class="modal-title" id="myModalLabel">Sissejuhatus</h5>
+            </div>
+            <img class="avatar" alt="avatar" src="img/avatar.png"/>
         </div>
 
         <div class="modal-body">
diff --git a/rannak/mangud/perenaine/memori/style.css b/rannak/mangud/perenaine/memori/style.css
index aed2515..6a29459 100644
--- a/rannak/mangud/perenaine/memori/style.css
+++ b/rannak/mangud/perenaine/memori/style.css
@@ -33,6 +33,18 @@ button:disabled{
 
 /* Modal Stuff */
 
+.avatar {
+    border-radius: 20px;
+    width: 100% !important;
+}
+
+.modalHeaderWrapper{
+    text-align: center;
+    margin: 0 !important;
+    width: 100% !important;
+}
+
+
 
 .closeModalButton {
   border-radius: 50px;
diff --git a/rannak/mangud/perenaine/ristsona/index.html b/rannak/mangud/perenaine/ristsona/index.html
index 5e106c7..e4de94f 100644
--- a/rannak/mangud/perenaine/ristsona/index.html
+++ b/rannak/mangud/perenaine/ristsona/index.html
@@ -58,10 +58,10 @@
         <div class="modal-content">
 
           <div class="modal-header">
-            <h5 class="modal-title" id="myModalLabel">Sissejuhatav info Ristsõna Mängule</h5>
-            <button type="button" class="closeModalButton" data-bs-dismiss="modal" aria-label="Close">
-              <span aria-hidden="true">&times;</span>
-            </button>
+            <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">
diff --git a/rannak/mangud/perenaine/ristsona/pildid/avatar.png b/rannak/mangud/perenaine/ristsona/pildid/avatar.png
new file mode 100644
index 0000000..60987d3
--- /dev/null
+++ b/rannak/mangud/perenaine/ristsona/pildid/avatar.png
diff --git a/rannak/mangud/perenaine/ristsona/style.css b/rannak/mangud/perenaine/ristsona/style.css
index b37fc5d..147df2f 100644
--- a/rannak/mangud/perenaine/ristsona/style.css
+++ b/rannak/mangud/perenaine/ristsona/style.css
@@ -39,6 +39,17 @@ button:disabled{
 
 /* Modal Stuff */
 
+.avatar {
+    border-radius: 20px;
+    width: 100% !important;
+}
+
+.modalHeaderWrapper{
+    text-align: center;
+    margin: 0 !important;
+    width: 100% !important;
+}
+
 
 
 .closeModalButton {
diff --git a/rannak/mangud/uliopilane/ajatelg/index.html b/rannak/mangud/uliopilane/ajatelg/index.html
index 54e958d..d4bd1c3 100644
--- a/rannak/mangud/uliopilane/ajatelg/index.html
+++ b/rannak/mangud/uliopilane/ajatelg/index.html
@@ -38,10 +38,10 @@
         <div class="modal-content">
 
           <div class="modal-header">
-            <h5 class="modal-title" id="myModalLabel">Sissejuhatus</h5>
-            <button type="button" class="closeModalButton" data-bs-dismiss="modal" aria-label="Close">
-              <span aria-hidden="true">&times;</span>
-            </button>
+            <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">
diff --git a/rannak/mangud/uliopilane/ajatelg/pildid/avatar.png b/rannak/mangud/uliopilane/ajatelg/pildid/avatar.png
new file mode 100644
index 0000000..dd044fd
--- /dev/null
+++ b/rannak/mangud/uliopilane/ajatelg/pildid/avatar.png
diff --git a/rannak/mangud/uliopilane/ajatelg/styles.css b/rannak/mangud/uliopilane/ajatelg/styles.css
index 2585bc4..56f9ca6 100644
--- a/rannak/mangud/uliopilane/ajatelg/styles.css
+++ b/rannak/mangud/uliopilane/ajatelg/styles.css
@@ -39,6 +39,19 @@ button:disabled{
 
 /* Modal Stuff */
 
+.avatar {
+    border-radius: 20px;
+    width: 100% !important;
+}
+
+.modalHeaderWrapper{
+    text-align: center;
+    margin: 0 !important;
+    width: 100% !important;
+}
+
+
+
 .closeModalButton {
   border-radius: 50px;
 }
diff --git a/rannak/mangud/uliopilane/tSark/img/avatar.png b/rannak/mangud/uliopilane/tSark/img/avatar.png
new file mode 100644
index 0000000..dd044fd
--- /dev/null
+++ b/rannak/mangud/uliopilane/tSark/img/avatar.png
diff --git a/rannak/mangud/uliopilane/tSark/index.html b/rannak/mangud/uliopilane/tSark/index.html
index 9fcbef6..789ad8f 100644
--- a/rannak/mangud/uliopilane/tSark/index.html
+++ b/rannak/mangud/uliopilane/tSark/index.html
@@ -27,10 +27,10 @@
         <div class="modal-content">
 
           <div class="modal-header">
-            <h5 class="modal-title" id="myModalLabel">Sissejuhatav info T-särgi Mängule</h5>
-            <button type="button" class="closeModalButton" data-bs-dismiss="modal" aria-label="Close">
-              <span aria-hidden="true">&times;</span>
-            </button>
+            <div class="modalHeaderWrapper">
+              <h3 class="modal-title" id="myModalLabel">Sissejuhatus</h5>
+            </div>
+            <img class="avatar" alt="avatar" src="img/avatar.png"/>
           </div>
 
           <div class="modal-body">
diff --git a/rannak/mangud/uliopilane/tSark/style.css b/rannak/mangud/uliopilane/tSark/style.css
index ff8a478..9696ffc 100644
--- a/rannak/mangud/uliopilane/tSark/style.css
+++ b/rannak/mangud/uliopilane/tSark/style.css
@@ -61,6 +61,19 @@ button:disabled{
 
 
 /* Modal Stuff */
+
+.avatar {
+    border-radius: 20px;
+    width: 100% !important;
+}
+
+.modalHeaderWrapper{
+    text-align: center;
+    margin: 0 !important;
+    width: 100% !important;
+}
+
+
 .modal{
     color: black !important;
 }
diff --git a/rannak/mangud/uliopilane/utlused/index.html b/rannak/mangud/uliopilane/utlused/index.html
index c45ee26..3619059 100644
--- a/rannak/mangud/uliopilane/utlused/index.html
+++ b/rannak/mangud/uliopilane/utlused/index.html
@@ -5,7 +5,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Kuulsad Ütlused</title>
-  <link rel="stylesheet" href="css/utlused.css">
+  <link rel="stylesheet" href="utlused.css">
 
     <link href="https://fonts.googleapis.com/css2?family=Permanent+Marker&display=swap" rel="stylesheet">
     <link rel="stylesheet" type=text/css href="utlused.css">
@@ -30,10 +30,10 @@
         <div class="modal-content">
 
           <div class="modal-header">
-            <h5 class="modal-title" id="myModalLabel">Sissejuhatus</h5>
-            <button type="button" class="closeModalButton" data-bs-dismiss="modal" aria-label="Close">
-              <span aria-hidden="true">&times;</span>
-            </button>
+            <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">
@@ -115,7 +115,7 @@
 
   </div>  
 
-  <script src="js/main.js"></script>
+  <script src="main.js"></script>
 
 
   <!-- JavaScript Bundle with Popper -->
diff --git a/rannak/mangud/uliopilane/utlused/js/main.js b/rannak/mangud/uliopilane/utlused/main.js
index 07b8d27..07b8d27 100644
--- a/rannak/mangud/uliopilane/utlused/js/main.js
+++ b/rannak/mangud/uliopilane/utlused/main.js
diff --git a/rannak/mangud/uliopilane/utlused/pildid/avatar.png b/rannak/mangud/uliopilane/utlused/pildid/avatar.png
new file mode 100644
index 0000000..dd044fd
--- /dev/null
+++ b/rannak/mangud/uliopilane/utlused/pildid/avatar.png
diff --git a/rannak/mangud/uliopilane/utlused/css/utlused.css b/rannak/mangud/uliopilane/utlused/utlused.css
index f4a3728..3835300 100644
--- a/rannak/mangud/uliopilane/utlused/css/utlused.css
+++ b/rannak/mangud/uliopilane/utlused/utlused.css
@@ -35,6 +35,16 @@ button:disabled{
 
 
 /* Modal Stuff */
+.avatar {
+    border-radius: 20px;
+    width: 100% !important;
+}
+
+.modalHeaderWrapper{
+    text-align: center;
+    margin: 0 !important;
+    width: 100% !important;
+}
 
 
 .closeModalButton {
@@ -45,13 +55,13 @@ button:disabled{
     position: absolute;
     top: 0;
     right: 0;
-    padding: 25px !important;
+    padding: 10px !important;
     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;
+    margin: 2% !important;
     font-size: 1.05rem !important;
     max-width: 10% !important;
 }
diff --git a/rannak/rolliValik/index.html b/rannak/rolliValik/index.html
index 95d6b41..6c2a14e 100644
--- a/rannak/rolliValik/index.html
+++ b/rannak/rolliValik/index.html
@@ -23,6 +23,13 @@
         <div class="col">
           <div class="card h-100">
             <img src="pildid/uliopilane.png" class="card-img-top" alt="...">
+
+            <!--
+            <video controls >
+              <source src="vids/partorg.mp4" type="video/mp4" />
+            </video>
+            -->
+
             <div class="card-body">
               <h5 class="card-title"><strong>Üliõpilane</strong></h5>
               <p class="card-text">Olen Virumaa poiss – täpsemalt Lääne-Viru maakonnast Rakke alevikust. See on üks selline keskmise suurusega raudteeasula, mille suur osa elanikest töötab kohalikus lubjatehases. </p>
diff --git a/rannak/rolliValik/vids/partorg.mp4 b/rannak/rolliValik/vids/partorg.mp4
new file mode 100644
index 0000000..da82768
--- /dev/null
+++ b/rannak/rolliValik/vids/partorg.mp4