diff options
author | Rasmus Luha <rasmus.luha@gmail.com> | 2022-12-21 00:13:31 +0200 |
---|---|---|
committer | Rasmus Luha <rasmus.luha@gmail.com> | 2022-12-21 00:13:31 +0200 |
commit | 9f6ff0f0ec88e43abae24b1e99a629bd42867dab (patch) | |
tree | 75b33d5de0d84e86119dbc1c913e68db7e8523f8 | |
parent | ee0da175151b4d48d4ef27f7acd8d3f9def25986 (diff) |
add sissejuhatus btn to uliopilane and perenaine
-rw-r--r-- | rannak/mangud/kaitseliitlane/kuulsused/styles.css | 13 | ||||
-rw-r--r-- | rannak/mangud/perenaine/memori/index.html | 49 | ||||
-rw-r--r-- | rannak/mangud/perenaine/memori/style.css | 32 | ||||
-rw-r--r-- | rannak/mangud/perenaine/ristsona/index.html | 48 | ||||
-rw-r--r-- | rannak/mangud/perenaine/ristsona/style.css | 26 | ||||
-rw-r--r-- | rannak/mangud/uliopilane/ajatelg/index.html | 47 | ||||
-rw-r--r-- | rannak/mangud/uliopilane/ajatelg/styles.css | 39 | ||||
-rw-r--r-- | rannak/mangud/uliopilane/tSark/index.html | 49 | ||||
-rw-r--r-- | rannak/mangud/uliopilane/tSark/style.css | 28 | ||||
-rw-r--r-- | rannak/mangud/uliopilane/utlused/css/utlused.css | 29 | ||||
-rw-r--r-- | rannak/mangud/uliopilane/utlused/index.html | 51 |
11 files changed, 388 insertions, 23 deletions
diff --git a/rannak/mangud/kaitseliitlane/kuulsused/styles.css b/rannak/mangud/kaitseliitlane/kuulsused/styles.css index a26b2c6..69ce297 100644 --- a/rannak/mangud/kaitseliitlane/kuulsused/styles.css +++ b/rannak/mangud/kaitseliitlane/kuulsused/styles.css @@ -56,16 +56,6 @@ img { /* Modal Stuff */ -/* -.modalButton { - position: fixed; - top: 0; - right: 0; - padding: 6px; - color: #fff; - margin: 3%; -} -*/ .closeModalButton { border-radius: 50px; @@ -75,8 +65,7 @@ img { position: absolute; top: 0; right: 0; - padding: 6px; - padding: 9px 25px; + padding: 25px !important; background-color: rgba(0,136,169,1) !important; border: none !important; border-radius: 50px !important; diff --git a/rannak/mangud/perenaine/memori/index.html b/rannak/mangud/perenaine/memori/index.html index ae402ef..6b87fa3 100644 --- a/rannak/mangud/perenaine/memori/index.html +++ b/rannak/mangud/perenaine/memori/index.html @@ -16,8 +16,52 @@ <h1>Memori</h1> <p>Mängu läbimiseks leia üles kõik kümme Talongipaari</p> </div> + + <!-- Button trigger modal --> + <button type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> + Sissejuhatus + </button> </div> + + + + <!-- 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"> + <div class="modal-content"> + + <div class="modal-header"> + <h5 class="modal-title" id="myModalLabel">Sissejuhatav info Memori Mängule</h5> + <button type="button" class="closeModalButton" data-bs-dismiss="modal" aria-label="Close"> + <span aria-hidden="true">×</span> + </button> + </div> + + <div class="modal-body"> + Odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo? + Arcu non odio euismod lacinia at quis risus sed vulputate odio. Nullam non nisi est, + sit amet facilisis magna etiam tempor, orci eu lobortis elementum, + nibh tellus molestie nunc, non blandit massa enim nec dui nunc. + <br/> + Odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo? + Arcu non odio euismod lacinia at quis risus sed vulputate odio. Nullam non nisi est, + sit amet facilisis magna etiam tempor, orci eu lobortis elementum, + nibh tellus molestie nunc, non blandit massa enim nec dui nunc. + <br/> + odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo? + arcu non odio euismod lacinia at quis risus sed vulputate odio. nullam non nisi est, + sit amet facilisis magna etiam tempor, orci eu lobortis elementum, + nibh tellus molestie nunc, non blandit massa enim nec dui nunc. + </div> + + </div> + </div> + </div> + + + + <section class="memory-game"> <div class="memory-card" data-framework="või"> @@ -158,5 +202,10 @@ </div> <script src="script.js"></script> + + + <!-- 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/rannak/mangud/perenaine/memori/style.css b/rannak/mangud/perenaine/memori/style.css index 56769a4..aed2515 100644 --- a/rannak/mangud/perenaine/memori/style.css +++ b/rannak/mangud/perenaine/memori/style.css @@ -29,6 +29,38 @@ button:disabled{ cursor: not-allowed; } + + +/* Modal Stuff */ + + +.closeModalButton { + border-radius: 50px; +} + +.modalButton{ + 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; + font-size: 1.2rem !important; + text-align: center !important; + position: absolute !important; + top: 65% !important; + left: 50% !important; + transform: translate(-50%, -50%) !important; +} + +.modalButton:hover{ + background-color: rgba(0,136,169,0.8) !important; +} + + + +/* Memory Game */ + + .memory-game { width: 640px; height: 640px; diff --git a/rannak/mangud/perenaine/ristsona/index.html b/rannak/mangud/perenaine/ristsona/index.html index f947eb7..bd09541 100644 --- a/rannak/mangud/perenaine/ristsona/index.html +++ b/rannak/mangud/perenaine/ristsona/index.html @@ -12,6 +12,11 @@ <body> + <!-- Button trigger modal --> + <button type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> + Sissejuhatus + </button> + <div class="container text-white text-center"> <h1>Ristsõna</h1> @@ -45,6 +50,44 @@ </div> + + + <!-- 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"> + <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">×</span> + </button> + </div> + + <div class="modal-body"> + Odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo? + Arcu non odio euismod lacinia at quis risus sed vulputate odio. Nullam non nisi est, + sit amet facilisis magna etiam tempor, orci eu lobortis elementum, + nibh tellus molestie nunc, non blandit massa enim nec dui nunc. + <br/> + Odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo? + Arcu non odio euismod lacinia at quis risus sed vulputate odio. Nullam non nisi est, + sit amet facilisis magna etiam tempor, orci eu lobortis elementum, + nibh tellus molestie nunc, non blandit massa enim nec dui nunc. + <br/> + odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo? + arcu non odio euismod lacinia at quis risus sed vulputate odio. nullam non nisi est, + sit amet facilisis magna etiam tempor, orci eu lobortis elementum, + nibh tellus molestie nunc, non blandit massa enim nec dui nunc. + </div> + + </div> + </div> + </div> + + + + <!-- Crossword --> <div class="main"> @@ -334,5 +377,10 @@ </div> <!-- End of main class--> <script src="script.js"></script> + + + <!-- 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/rannak/mangud/perenaine/ristsona/style.css b/rannak/mangud/perenaine/ristsona/style.css index 28f1178..d0d405e 100644 --- a/rannak/mangud/perenaine/ristsona/style.css +++ b/rannak/mangud/perenaine/ristsona/style.css @@ -25,6 +25,32 @@ button:disabled{ cursor: not-allowed; } +/* Modal Stuff */ + + + +.closeModalButton { + border-radius: 50px; +} + +.modalButton{ + position: absolute; + top: 0; + 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; +} + +.modalButton:hover{ + background-color: rgba(0,136,169,0.8) !important; +} /* Input Box styles */ diff --git a/rannak/mangud/uliopilane/ajatelg/index.html b/rannak/mangud/uliopilane/ajatelg/index.html index 156d28d..d1855b7 100644 --- a/rannak/mangud/uliopilane/ajatelg/index.html +++ b/rannak/mangud/uliopilane/ajatelg/index.html @@ -11,6 +11,13 @@ <body class="text-white"> + + <!-- Button trigger modal --> + <button type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> + Sissejuhatus + </button> + + <div class="text-center text-white align-items-center pb-5 pealkiri"> <h1 class="pb-1 pt-2">Ajatelg</h1> <p>Pane Sündumsed ajateljel õigsse järjekorda</p> @@ -24,6 +31,43 @@ </div> + + <!-- Modal --> + <div class="modal fade text-black" id="myModal" tabindex="-10" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> + <div class="modal-dialog" role="document"> + <div class="modal-content"> + + <div class="modal-header"> + <h5 class="modal-title" id="myModalLabel">Sissejuhatav info Ajatelje Mängule</h5> + <button type="button" class="closeModalButton" data-bs-dismiss="modal" aria-label="Close"> + <span aria-hidden="true">×</span> + </button> + </div> + + <div class="modal-body"> + Odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo? + Arcu non odio euismod lacinia at quis risus sed vulputate odio. Nullam non nisi est, + sit amet facilisis magna etiam tempor, orci eu lobortis elementum, + nibh tellus molestie nunc, non blandit massa enim nec dui nunc. + <br/> + Odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo? + Arcu non odio euismod lacinia at quis risus sed vulputate odio. Nullam non nisi est, + sit amet facilisis magna etiam tempor, orci eu lobortis elementum, + nibh tellus molestie nunc, non blandit massa enim nec dui nunc. + <br/> + odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo? + arcu non odio euismod lacinia at quis risus sed vulputate odio. nullam non nisi est, + sit amet facilisis magna etiam tempor, orci eu lobortis elementum, + nibh tellus molestie nunc, non blandit massa enim nec dui nunc. + </div> + + </div> + </div> + </div> + + + + <!-- Main stuff --> <div class="row"> @@ -175,8 +219,7 @@ </div> - - </div> + </div> <!-- Row --> <script src="script.js"></script> diff --git a/rannak/mangud/uliopilane/ajatelg/styles.css b/rannak/mangud/uliopilane/ajatelg/styles.css index 5966c9b..2585bc4 100644 --- a/rannak/mangud/uliopilane/ajatelg/styles.css +++ b/rannak/mangud/uliopilane/ajatelg/styles.css @@ -4,8 +4,8 @@ html { } * { - margin: 0 !important; - padding: 0 !important; + margin: 0; + padding: 0; box-sizing: border-box !important; } @@ -37,6 +37,32 @@ button:disabled{ cursor: not-allowed; } +/* Modal Stuff */ + +.closeModalButton { + border-radius: 50px; +} + +.modalButton{ + position: absolute; + top: 0; + 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.4rem !important; +} + +.modalButton:hover{ + background-color: rgba(0,136,169,0.8) !important; +} + + /* Left side Part */ @@ -63,6 +89,11 @@ button:disabled{ /* Timeline css part*/ +.timelineWrapper{ + padding: 0 !important; + margin: 0 !important; +} + .timelineContainer { min-height: 100vh; width: 100%; @@ -85,10 +116,10 @@ button:disabled{ } .timeline ul li { - padding: 20px; + padding: 7px; background-color: #1e1f22; color: white; - margin-bottom: 20px; + margin-bottom: 15px; } .timeline ul li:last-child { diff --git a/rannak/mangud/uliopilane/tSark/index.html b/rannak/mangud/uliopilane/tSark/index.html index 382c382..dc2aafb 100644 --- a/rannak/mangud/uliopilane/tSark/index.html +++ b/rannak/mangud/uliopilane/tSark/index.html @@ -3,16 +3,14 @@ <title>Särgi Kujundus</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <link href="style.css" rel="stylesheet"/> - <!-- + <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"> - --> </head> <body> <div class="containeraa"> - <!-- Tshirt SVG --> <svg viewBox="0 0 512 512"> <g transform="translate(0,448)"> @@ -23,6 +21,45 @@ + <!-- 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"> + <div class="modal-content"> + + <div class="modal-header"> + <h5 class="modal-title" id="myModalLabel">Sissejuhatav info Kuulsuste Mängule</h5> + <button type="button" class="closeModalButton" data-bs-dismiss="modal" aria-label="Close"> + <span aria-hidden="true">×</span> + </button> + </div> + + <div class="modal-body"> + Odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo? + Arcu non odio euismod lacinia at quis risus sed vulputate odio. Nullam non nisi est, + sit amet facilisis magna etiam tempor, orci eu lobortis elementum, + nibh tellus molestie nunc, non blandit massa enim nec dui nunc. + <br/> + Odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo? + Arcu non odio euismod lacinia at quis risus sed vulputate odio. Nullam non nisi est, + sit amet facilisis magna etiam tempor, orci eu lobortis elementum, + nibh tellus molestie nunc, non blandit massa enim nec dui nunc. + <br/> + odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo? + arcu non odio euismod lacinia at quis risus sed vulputate odio. nullam non nisi est, + sit amet facilisis magna etiam tempor, orci eu lobortis elementum, + nibh tellus molestie nunc, non blandit massa enim nec dui nunc. + </div> + + </div> + </div> + </div> + + + + + + + <!-- Side panel stuff--> <div class="side"> @@ -38,6 +75,12 @@ <button class="checkMoveOn">Kontrolli, kas särk valmis</button> <button class="moveOn" disabled>Liigu Edasi</button> + <!-- Button trigger modal --> + <button type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> + Sissejuhatus + </button> + + <div class="messageBox"> </div> </div> diff --git a/rannak/mangud/uliopilane/tSark/style.css b/rannak/mangud/uliopilane/tSark/style.css index 0bac36a..99f5fd8 100644 --- a/rannak/mangud/uliopilane/tSark/style.css +++ b/rannak/mangud/uliopilane/tSark/style.css @@ -1,5 +1,5 @@ body{ - background-color: #E3D4AD; + background-color: #fffcc9 !important; box-sizing: border-box; margin: 0; padding: 0; @@ -18,7 +18,7 @@ body{ width: 50%; height: 100vh; text-align: center; - background-color: #D3BC8D; + background-color: #B3B07B; } @@ -54,6 +54,30 @@ button:disabled{ +/* Modal Stuff */ + +.closeModalButton { + border-radius: 50px; +} + +.modalButton{ + padding: 5px !important; + margin-left: 60px !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; + font-size: 1.1rem !important; +} + +.modalButton:hover{ + background-color: rgba(0,136,169,0.8) !important; +} + + + + /* Svg stuff*/ svg { diff --git a/rannak/mangud/uliopilane/utlused/css/utlused.css b/rannak/mangud/uliopilane/utlused/css/utlused.css index e7c5277..b479b87 100644 --- a/rannak/mangud/uliopilane/utlused/css/utlused.css +++ b/rannak/mangud/uliopilane/utlused/css/utlused.css @@ -32,6 +32,35 @@ button:disabled{ opacity: 0.5; } + +/* Modal Stuff */ + + +.closeModalButton { + border-radius: 50px; +} + +.modalButton{ + position: absolute; + top: 0; + right: 0; + padding: 25px !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; + font-size: 1.2rem !important; +} + +.modalButton:hover{ + background-color: rgba(0,136,169,0.8) !important; +} + + + + /* later added stuff here */ .wrapper { diff --git a/rannak/mangud/uliopilane/utlused/index.html b/rannak/mangud/uliopilane/utlused/index.html index 510c62d..6436bdd 100644 --- a/rannak/mangud/uliopilane/utlused/index.html +++ b/rannak/mangud/uliopilane/utlused/index.html @@ -14,6 +14,53 @@ </head> <body class="bg-dark"> + + + + <!-- 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"> + <div class="modal-content"> + + <div class="modal-header"> + <h5 class="modal-title" id="myModalLabel">Sissejuhatav info Kuulsate Ütluste Mängule</h5> + <button type="button" class="closeModalButton" data-bs-dismiss="modal" aria-label="Close"> + <span aria-hidden="true">×</span> + </button> + </div> + + <div class="modal-body"> + Odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo? + Arcu non odio euismod lacinia at quis risus sed vulputate odio. Nullam non nisi est, + sit amet facilisis magna etiam tempor, orci eu lobortis elementum, + nibh tellus molestie nunc, non blandit massa enim nec dui nunc. + <br/> + Odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo? + Arcu non odio euismod lacinia at quis risus sed vulputate odio. Nullam non nisi est, + sit amet facilisis magna etiam tempor, orci eu lobortis elementum, + nibh tellus molestie nunc, non blandit massa enim nec dui nunc. + <br/> + odio eu feugiat pretium, nibh ipsum consequat nisl, vel pretium lectus quam id leo? + arcu non odio euismod lacinia at quis risus sed vulputate odio. nullam non nisi est, + sit amet facilisis magna etiam tempor, orci eu lobortis elementum, + nibh tellus molestie nunc, non blandit massa enim nec dui nunc. + </div> + + </div> + </div> + </div> + + + + + <div class="wrapper container draggable-elements align-items-center"> <div class="empty "> @@ -76,5 +123,9 @@ </div> <script src="js/main.js"></script> + + + <!-- 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> |