diff options
| author | Rasmus <rasmus.luha@gmail.com> | 2023-03-13 16:33:45 +0200 |
|---|---|---|
| committer | Rasmus <rasmus.luha@gmail.com> | 2023-03-13 16:33:45 +0200 |
| commit | c40293acd3a00b20d74cf37823b7efb1b75dec9b (patch) | |
| tree | baae5261dae9549bdb24f74aa2249965ec183fbc | |
| parent | 1add8ef6285df97270dae4df9f68591443fc5925 (diff) | |
Sissejuhatus Btn clean
64 files changed, 653 insertions, 238 deletions
diff --git a/rannak/mangud/arimees/pood.bak/fonts/1001fonts-eutemia-i-eula.txt b/rannak/mangud/arimees/baks/pood.bak/fonts/1001fonts-eutemia-i-eula.txt index b3cf91f..b3cf91f 100755 --- a/rannak/mangud/arimees/pood.bak/fonts/1001fonts-eutemia-i-eula.txt +++ b/rannak/mangud/arimees/baks/pood.bak/fonts/1001fonts-eutemia-i-eula.txt diff --git a/rannak/mangud/arimees/pood.bak/fonts/Eutemia.ttf b/rannak/mangud/arimees/baks/pood.bak/fonts/Eutemia.ttf Binary files differindex c575e59..c575e59 100755 --- a/rannak/mangud/arimees/pood.bak/fonts/Eutemia.ttf +++ b/rannak/mangud/arimees/baks/pood.bak/fonts/Eutemia.ttf diff --git a/rannak/mangud/arimees/pood.bak/index.html b/rannak/mangud/arimees/baks/pood.bak/index.html index 5b01902..5b01902 100755 --- a/rannak/mangud/arimees/pood.bak/index.html +++ b/rannak/mangud/arimees/baks/pood.bak/index.html diff --git a/rannak/mangud/arimees/pood.bak/pildid/avatar.png b/rannak/mangud/arimees/baks/pood.bak/pildid/avatar.png Binary files differindex 3cb21cf..3cb21cf 100755 --- a/rannak/mangud/arimees/pood.bak/pildid/avatar.png +++ b/rannak/mangud/arimees/baks/pood.bak/pildid/avatar.png diff --git a/rannak/mangud/arimees/pood.bak/pildid/kingad.png b/rannak/mangud/arimees/baks/pood.bak/pildid/kingad.png Binary files differindex ef106ae..ef106ae 100755 --- a/rannak/mangud/arimees/pood.bak/pildid/kingad.png +++ b/rannak/mangud/arimees/baks/pood.bak/pildid/kingad.png diff --git a/rannak/mangud/arimees/pood.bak/pildid/kohver.png b/rannak/mangud/arimees/baks/pood.bak/pildid/kohver.png Binary files differindex 485b6db..485b6db 100755 --- a/rannak/mangud/arimees/pood.bak/pildid/kohver.png +++ b/rannak/mangud/arimees/baks/pood.bak/pildid/kohver.png diff --git a/rannak/mangud/arimees/pood.bak/pildid/kupsis.png b/rannak/mangud/arimees/baks/pood.bak/pildid/kupsis.png Binary files differindex 2419f89..2419f89 100755 --- a/rannak/mangud/arimees/pood.bak/pildid/kupsis.png +++ b/rannak/mangud/arimees/baks/pood.bak/pildid/kupsis.png diff --git a/rannak/mangud/arimees/pood.bak/pildid/laud.png b/rannak/mangud/arimees/baks/pood.bak/pildid/laud.png Binary files differindex e3036dc..e3036dc 100755 --- a/rannak/mangud/arimees/pood.bak/pildid/laud.png +++ b/rannak/mangud/arimees/baks/pood.bak/pildid/laud.png diff --git a/rannak/mangud/arimees/pood.bak/pildid/sai.png b/rannak/mangud/arimees/baks/pood.bak/pildid/sai.png Binary files differindex 8add13c..8add13c 100755 --- a/rannak/mangud/arimees/pood.bak/pildid/sai.png +++ b/rannak/mangud/arimees/baks/pood.bak/pildid/sai.png diff --git a/rannak/mangud/arimees/pood.bak/pildid/tugitool.png b/rannak/mangud/arimees/baks/pood.bak/pildid/tugitool.png Binary files differindex c48bd50..c48bd50 100755 --- a/rannak/mangud/arimees/pood.bak/pildid/tugitool.png +++ b/rannak/mangud/arimees/baks/pood.bak/pildid/tugitool.png diff --git a/rannak/mangud/arimees/pood.bak/script.js b/rannak/mangud/arimees/baks/pood.bak/script.js index 3b3e67b..3b3e67b 100755 --- a/rannak/mangud/arimees/pood.bak/script.js +++ b/rannak/mangud/arimees/baks/pood.bak/script.js diff --git a/rannak/mangud/arimees/pood.bak/styles.css b/rannak/mangud/arimees/baks/pood.bak/styles.css index 58bc290..58bc290 100755 --- a/rannak/mangud/arimees/pood.bak/styles.css +++ b/rannak/mangud/arimees/baks/pood.bak/styles.css diff --git a/rannak/mangud/arimees/pood/fonts/1001fonts-eutemia-i-eula.txt b/rannak/mangud/arimees/baks/pood/fonts/1001fonts-eutemia-i-eula.txt index b3cf91f..b3cf91f 100755 --- a/rannak/mangud/arimees/pood/fonts/1001fonts-eutemia-i-eula.txt +++ b/rannak/mangud/arimees/baks/pood/fonts/1001fonts-eutemia-i-eula.txt diff --git a/rannak/mangud/arimees/pood/fonts/Eutemia.ttf b/rannak/mangud/arimees/baks/pood/fonts/Eutemia.ttf Binary files differindex c575e59..c575e59 100755 --- a/rannak/mangud/arimees/pood/fonts/Eutemia.ttf +++ b/rannak/mangud/arimees/baks/pood/fonts/Eutemia.ttf diff --git a/rannak/mangud/arimees/baks/pood/index.html b/rannak/mangud/arimees/baks/pood/index.html new file mode 100755 index 0000000..6c2f7b5 --- /dev/null +++ b/rannak/mangud/arimees/baks/pood/index.html @@ -0,0 +1,62 @@ +<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> Pood </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 class="text-white"> + + <div class="container text-center text-white align-items-center pb-1"> + <h1 class="pb-1 pt-2"> Pood </h1> + <p> Leia toodete tolleaegne hind Eesti Markades, kasutades Rubla ja Marga vahelist kurssi.</p> + <div class="row"> + <div> + <button class="moveOn" disabled>Liigu Edasi</button> + </div> + + </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"> + <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"> + Lähen siin varsti Georg Otsaga Helsinki ostoksille. + <br/> + <strong> + Äkki saate vähe aidata mul plaani pidada, mida kõige kasulikum oleks 10 000 rutsiga ära tuua? Äkki tahate ise ka midagi, võin soodsalt tuua! + </strong> + </div> + + </div> + </div> + </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/arimees/baks/pood/pildid/avatar.png b/rannak/mangud/arimees/baks/pood/pildid/avatar.png Binary files differnew file mode 100755 index 0000000..3cb21cf --- /dev/null +++ b/rannak/mangud/arimees/baks/pood/pildid/avatar.png diff --git a/rannak/mangud/arimees/pood/pildid/kingad.png b/rannak/mangud/arimees/baks/pood/pildid/kingad.png Binary files differindex ef106ae..ef106ae 100755 --- a/rannak/mangud/arimees/pood/pildid/kingad.png +++ b/rannak/mangud/arimees/baks/pood/pildid/kingad.png diff --git a/rannak/mangud/arimees/pood/pildid/kohver.png b/rannak/mangud/arimees/baks/pood/pildid/kohver.png Binary files differindex 485b6db..485b6db 100755 --- a/rannak/mangud/arimees/pood/pildid/kohver.png +++ b/rannak/mangud/arimees/baks/pood/pildid/kohver.png diff --git a/rannak/mangud/arimees/pood/pildid/kupsis.png b/rannak/mangud/arimees/baks/pood/pildid/kupsis.png Binary files differindex 2419f89..2419f89 100755 --- a/rannak/mangud/arimees/pood/pildid/kupsis.png +++ b/rannak/mangud/arimees/baks/pood/pildid/kupsis.png diff --git a/rannak/mangud/arimees/pood/pildid/laud.png b/rannak/mangud/arimees/baks/pood/pildid/laud.png Binary files differindex e3036dc..e3036dc 100755 --- a/rannak/mangud/arimees/pood/pildid/laud.png +++ b/rannak/mangud/arimees/baks/pood/pildid/laud.png diff --git a/rannak/mangud/arimees/pood/pildid/sai.png b/rannak/mangud/arimees/baks/pood/pildid/sai.png Binary files differindex 8add13c..8add13c 100755 --- a/rannak/mangud/arimees/pood/pildid/sai.png +++ b/rannak/mangud/arimees/baks/pood/pildid/sai.png diff --git a/rannak/mangud/arimees/pood/pildid/tugitool.png b/rannak/mangud/arimees/baks/pood/pildid/tugitool.png Binary files differindex c48bd50..c48bd50 100755 --- a/rannak/mangud/arimees/pood/pildid/tugitool.png +++ b/rannak/mangud/arimees/baks/pood/pildid/tugitool.png diff --git a/rannak/mangud/arimees/baks/pood/script.js b/rannak/mangud/arimees/baks/pood/script.js new file mode 100755 index 0000000..3b3e67b --- /dev/null +++ b/rannak/mangud/arimees/baks/pood/script.js @@ -0,0 +1,69 @@ +document.addEventListener('DOMContentLoaded', () => { + let btn = document.querySelector('.modalButton'); + btn.click(); +}); + + + +const kurss = 15.6; +doneCounter = 0; + + +const kontrollBtns = document.querySelectorAll(".kontrolliKaarti"); +for (let nupp of kontrollBtns){ + nupp.addEventListener("click", (e) => { + let rublaHind = e.target.previousElementSibling.children[0].children[1].innerHTML; + let pakkumine = e.target.previousElementSibling.children[1].children[1].value; + + if (pakkumine*kurss == rublaHind){ + + //Change color + e.target.offsetParent.style.background = "#288654"; + e.target.previousElementSibling.children[0].style.borderRight = ".5rem solid #288654"; + e.target.previousElementSibling.children[1].style.borderLeft = ".5rem solid #288654"; + + //Change Element + + (e.target.previousElementSibling.children[1].children[1]).remove(); + const newEl = document.createElement("span"); + newEl.classList.add("symbol"); + newEl.innerHTML = pakkumine + " M"; + e.target.previousElementSibling.children[1].appendChild(newEl); + + e.target.remove(); + doneCounter++; + + + // InfoTxt + let infoTxt = document.querySelector(".infoTxt") + infoTxt.innerHTML = ""; + + if (doneCounter >= 6){ + enableAllGood(); + } + } + + + else{ + // Inputvalue Reset + e.target.previousElementSibling.children[1].children[1].value = ""; + + // InfoTxt + let infoTxt = document.querySelector(".infoTxt") + infoTxt.style.color = "red"; + infoTxt.innerHTML = "Proovi Uuesti!"; + + } + + + + }) +} + + + +function enableAllGood(){ + const btn = document.querySelector(".moveOn"); + btn.disabled = false; + btn.onclick = () => location.href = ""; +} diff --git a/rannak/mangud/arimees/pood/styles.css b/rannak/mangud/arimees/baks/pood/styles.css index 58bc290..58bc290 100755 --- a/rannak/mangud/arimees/pood/styles.css +++ b/rannak/mangud/arimees/baks/pood/styles.css diff --git a/rannak/mangud/arimees/muusika/index.html b/rannak/mangud/arimees/muusika/index.html index 916e7e9..e1e80ab 100755 --- a/rannak/mangud/arimees/muusika/index.html +++ b/rannak/mangud/arimees/muusika/index.html @@ -14,11 +14,6 @@ <body> - <!-- Button trigger modal --> - <button id="testModal" 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>Muusika</h1> <p> @@ -31,6 +26,11 @@ <div class="col"> <button class="moveOn" disabled>Liigu Edasi</button> + + <!-- Button trigger modal --> + <button id="testModal" type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> + Sissejuhatus + </button> </div> </div> diff --git a/rannak/mangud/arimees/muusika/laulud/OhkKonnidTanaval.mp3 b/rannak/mangud/arimees/muusika/laulud/OhkKonnibTanaval.mp3 Binary files differindex 3fa9fbd..3fa9fbd 100644 --- a/rannak/mangud/arimees/muusika/laulud/OhkKonnidTanaval.mp3 +++ b/rannak/mangud/arimees/muusika/laulud/OhkKonnibTanaval.mp3 diff --git a/rannak/mangud/arimees/muusika/style.css b/rannak/mangud/arimees/muusika/style.css index ab7c91d..3b7e248 100755 --- a/rannak/mangud/arimees/muusika/style.css +++ b/rannak/mangud/arimees/muusika/style.css @@ -54,18 +54,15 @@ button:disabled{ } .modalButton{ - position: absolute; - top: 0; - right: 0; - padding: 6px; - padding: 9px 25px; + display: inline-block; + padding: 6px 12px; + margin-left: 30px; 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; + font-size: 1rem; } .modalButton:hover{ diff --git a/rannak/mangud/arimees/pood/index.html b/rannak/mangud/arimees/pood/index.html index 6c2f7b5..1e83723 100755 --- a/rannak/mangud/arimees/pood/index.html +++ b/rannak/mangud/arimees/pood/index.html @@ -1,30 +1,39 @@ +<!DOCTYPE html> <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> Pood </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"> + <meta charset="UTF-8"> + <meta name="viewport" content="width=device-width, initial-scale=1" /> + + <title>Pood</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="style.css"> </head> -<body class="text-white"> +<body> + + + <!-- Button trigger modal --> + <button id="testModal" 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>Pood</h1> + <p> + Vali kataloogidest erineivaid tooteid, mida soovid osta + <br/> + ning arvuta ka nende kurss + </p> - <div class="container text-center text-white align-items-center pb-1"> - <h1 class="pb-1 pt-2"> Pood </h1> - <p> Leia toodete tolleaegne hind Eesti Markades, kasutades Rubla ja Marga vahelist kurssi.</p> - <div class="row"> - <div> - <button class="moveOn" disabled>Liigu Edasi</button> - </div> + <div class="text-center"> + <div class="col"> + <button class="moveOn" disabled>Liigu Edasi</button> </div> - <!-- Button trigger modal --> - <button type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> - Sissejuhatus - </button> + </div> </div> @@ -41,10 +50,22 @@ </div> <div class="modal-body"> - Lähen siin varsti Georg Otsaga Helsinki ostoksille. + + <p> + Lähen siin varsti Georg Otsaga Helsinki ostoksille. Uut kaupa oleks vaja. + Mul täie kuumaga äri käib praegu! Sirvisin veits uusi katalooge, ikka on + hea kaubal silm peal hoida. Äkki saate nats aidata mul plaani pidada, + mida oleks kõige kasulikum 12 000 rutsiga ära tuua? Kurss on praegu päris + ilus - 1 FIM= 7,356 rubla. Põhiline, et oleks palju erinevaid kaupu ja + kogu raha saaks ära kulutatud! Aga sellega vist problat ei tule. + Äkki tahate ise ka midagi, võin soodsalt tuua! + </p> <br/> <strong> - Äkki saate vähe aidata mul plaani pidada, mida kõige kasulikum oleks 10 000 rutsiga ära tuua? Äkki tahate ise ka midagi, võin soodsalt tuua! + Selleks lappa katalooge, vali omale sobiv nodi välja ja pane + tabelisse - mida, kui palju, mis rahaga siin ja sealpool lahte arvestama peab. + Ole hea, vali erinevat kraami - ega ma kohalik kaubamaja ole, + et kümmet ühesugust kitlit müüma hakkan! Ole nüüd! </strong> </div> @@ -53,10 +74,219 @@ </div> + <!-- Main Stuff --> + <div class="main"> + <h3>Sirvi ajakirja</h3> + + <div class="ajakiriWrapper"> + + + + <ul class="nav nav-tabs" id="myTab" role="tablist"> + + <li class="nav-item" role="presentation"> + <button class="nav-link active" id="tab1" data-bs-toggle="tab" data-bs-target="#tab-pane1" type="button" role="tab" aria-controls="tab-pane1" aria-selected="true">1</button> + </li> + + <li class="nav-item" role="presentation"> + <button class="nav-link" id="tab2" data-bs-toggle="tab" data-bs-target="#tab-pane2" type="button" role="tab" aria-controls="tab-pane2" aria-selected="false">2</button> + </li> + + <li class="nav-item" role="presentation"> + <button class="nav-link" id="tab3" data-bs-toggle="tab" data-bs-target="#tab-pane3" type="button" role="tab" aria-controls="tab-pane3" aria-selected="false">3</button> + </li> + + <li class="nav-item" role="presentation"> + <button class="nav-link" id="tab4" data-bs-toggle="tab" data-bs-target="#tab-pane4" type="button" role="tab" aria-controls="tab-pane4" aria-selected="false" >4</button> + </li> + + <li class="nav-item" role="presentation"> + <button class="nav-link" id="tab5" data-bs-toggle="tab" data-bs-target="#tab-pane5" type="button" role="tab" aria-controls="tab-pane5" aria-selected="false" >5</button> + </li> + + <li class="nav-item" role="presentation"> + <button class="nav-link" id="tab6" data-bs-toggle="tab" data-bs-target="#tab-pane6" type="button" role="tab" aria-controls="tab-pane6" aria-selected="false" >6</button> + </li> + + <li class="nav-item" role="presentation"> + <button class="nav-link" id="tab7" data-bs-toggle="tab" data-bs-target="#tab-pane7" type="button" role="tab" aria-controls="tab-pane7" aria-selected="false" >7</button> + </li> + + <li class="nav-item" role="presentation"> + <button class="nav-link" id="tab8" data-bs-toggle="tab" data-bs-target="#tab-pane8" type="button" role="tab" aria-controls="tab-pane8" aria-selected="false" >8</button> + </li> + + <li class="nav-item" role="presentation"> + <button class="nav-link" id="tab9" data-bs-toggle="tab" data-bs-target="#tab-pane9" type="button" role="tab" aria-controls="tab-pane9" aria-selected="false" >9</button> + </li> + + <li class="nav-item" role="presentation"> + <button class="nav-link" id="tab10" data-bs-toggle="tab" data-bs-target="#tab-pane10" type="button" role="tab" aria-controls="tab-pane10" aria-selected="false" >10</button> + </li> + + <li class="nav-item" role="presentation"> + <button class="nav-link" id="tab11" data-bs-toggle="tab" data-bs-target="#tab-pane11" type="button" role="tab" aria-controls="tab-pane11" aria-selected="false" >11</button> + </li> + + </ul> + + + + + + <div class="tab-content" id="myTabContent"> + + <div class="tab-pane fade show active" id="tab-pane1" role="tabpanel" aria-labelledby="tab1" tabindex="0"> + <img alt="Ajakirja lehekülg" src="pildid/1.jpg"/> + </div> + + <div class="tab-pane fade" id="tab-pane2" role="tabpanel" aria-labelledby="2-tab" tabindex="0"> + <img alt="Ajakirja lehekülg" src="pildid/2.jpg"/> + </div> + + <div class="tab-pane fade" id="tab-pane3" role="tabpanel" aria-labelledby="3-tab" tabindex="0"> + <img alt="Ajakirja lehekülg" src="pildid/3.jpg"/> + </div> + + <div class="tab-pane fade" id="tab-pane4" role="tabpanel" aria-labelledby="4-tab" tabindex="0"> + <img alt="Ajakirja lehekülg" src="pildid/4.jpg"/> + </div> + + <div class="tab-pane fade" id="tab-pane5" role="tabpanel" aria-labelledby="5-tab" tabindex="0"> + <img alt="Ajakirja lehekülg" src="pildid/5.jpg"/> + </div> + + <div class="tab-pane fade" id="tab-pane6" role="tabpanel" aria-labelledby="6-tab" tabindex="0"> + <img alt="Ajakirja lehekülg" src="pildid/6.jpg"/> + </div> + + <div class="tab-pane fade" id="tab-pane7" role="tabpanel" aria-labelledby="7-tab" tabindex="0"> + <img alt="Ajakirja lehekülg" src="pildid/7.jpg"/> + </div> + + <div class="tab-pane fade" id="tab-pane8" role="tabpanel" aria-labelledby="8-tab" tabindex="0"> + <img alt="Ajakirja lehekülg" src="pildid/8.jpg"/> + </div> + + <div class="tab-pane fade" id="tab-pane9" role="tabpanel" aria-labelledby="9-tab" tabindex="0"> + <img alt="Ajakirja lehekülg" src="pildid/9.jpg"/> + </div> + + <div class="tab-pane fade" id="tab-pane10" role="tabpanel" aria-labelledby="10-tab" tabindex="0"> + <img alt="Ajakirja lehekülg" src="pildid/10.jpg"/> + </div> + + <div class="tab-pane fade" id="tab-pane11" role="tabpanel" aria-labelledby="11-tab" tabindex="0"> + <img alt="Ajakirja lehekülg" src="pildid/11.jpg"/> + </div> + + </div> + + + + </div> + <!-- Ajakirja Wrapper End --> + + + + <!-- Tabel --> + <h3>Ostunimekiri</h3> + + <div class="tabelWrapper"> + <table class="table table-dark table-striped"> + <tr> + <th><strong>Toode</strong></th> + <th><strong>Hind(FIM)</strong></th> + <th><strong>Hind(Rubla)</strong></th> + <th><strong>Tükki</strong></th> + <th><strong>Summa(Rubla)</strong></th> + </tr> + <tr> + <td></td> + <td></td> + <td></td> + <td></td> + <td></td> + </tr> + <tr> + <td></td> + <td></td> + <td></td> + <td></td> + <td></td> + </tr> + <tr> + <td></td> + <td></td> + <td></td> + <td></td> + <td></td> + </tr> + <tr> + <td></td> + <td></td> + <td></td> + <td></td> + <td></td> + </tr> + <tr> + <td></td> + <td></td> + <td></td> + <td></td> + <td></td> + </tr> + <tr> + <td></td> + <td></td> + <td></td> + <td></td> + <td></td> + </tr> + <tr> + <td></td> + <td></td> + <td></td> + <td></td> + <td></td> + </tr> + <tr> + <td></td> + <td></td> + <td></td> + <td></td> + <td></td> + </tr> + <tr> + <td></td> + <td></td> + <td></td> + <td></td> + <td></td> + </tr> + <tr> + <td></td> + <td></td> + <td></td> + <td></td> + <td></td> + </tr> + </table> + + + </div> + + <!-- Tabeli lõpp --> + + + </div> + <!-- Main End --> + + + <script src="script.js"></script> - <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> - <!-- 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/arimees/pood/pildid/1.jpg b/rannak/mangud/arimees/pood/pildid/1.jpg Binary files differnew file mode 100644 index 0000000..fc78d01 --- /dev/null +++ b/rannak/mangud/arimees/pood/pildid/1.jpg diff --git a/rannak/mangud/arimees/pood/pildid/10.jpg b/rannak/mangud/arimees/pood/pildid/10.jpg Binary files differnew file mode 100644 index 0000000..7eb4231 --- /dev/null +++ b/rannak/mangud/arimees/pood/pildid/10.jpg diff --git a/rannak/mangud/arimees/pood/pildid/11.jpg b/rannak/mangud/arimees/pood/pildid/11.jpg Binary files differnew file mode 100644 index 0000000..e91c8b5 --- /dev/null +++ b/rannak/mangud/arimees/pood/pildid/11.jpg diff --git a/rannak/mangud/arimees/pood/pildid/2.jpg b/rannak/mangud/arimees/pood/pildid/2.jpg Binary files differnew file mode 100644 index 0000000..aab350e --- /dev/null +++ b/rannak/mangud/arimees/pood/pildid/2.jpg diff --git a/rannak/mangud/arimees/pood/pildid/3.jpg b/rannak/mangud/arimees/pood/pildid/3.jpg Binary files differnew file mode 100644 index 0000000..9bfc7d6 --- /dev/null +++ b/rannak/mangud/arimees/pood/pildid/3.jpg diff --git a/rannak/mangud/arimees/pood/pildid/4.jpg b/rannak/mangud/arimees/pood/pildid/4.jpg Binary files differnew file mode 100644 index 0000000..ec8a0af --- /dev/null +++ b/rannak/mangud/arimees/pood/pildid/4.jpg diff --git a/rannak/mangud/arimees/pood/pildid/5.jpg b/rannak/mangud/arimees/pood/pildid/5.jpg Binary files differnew file mode 100644 index 0000000..d728f57 --- /dev/null +++ b/rannak/mangud/arimees/pood/pildid/5.jpg diff --git a/rannak/mangud/arimees/pood/pildid/6.jpg b/rannak/mangud/arimees/pood/pildid/6.jpg Binary files differnew file mode 100644 index 0000000..ce21865 --- /dev/null +++ b/rannak/mangud/arimees/pood/pildid/6.jpg diff --git a/rannak/mangud/arimees/pood/pildid/7.jpg b/rannak/mangud/arimees/pood/pildid/7.jpg Binary files differnew file mode 100644 index 0000000..4a6c15d --- /dev/null +++ b/rannak/mangud/arimees/pood/pildid/7.jpg diff --git a/rannak/mangud/arimees/pood/pildid/8.jpg b/rannak/mangud/arimees/pood/pildid/8.jpg Binary files differnew file mode 100644 index 0000000..f63c3a0 --- /dev/null +++ b/rannak/mangud/arimees/pood/pildid/8.jpg diff --git a/rannak/mangud/arimees/pood/pildid/9.jpg b/rannak/mangud/arimees/pood/pildid/9.jpg Binary files differnew file mode 100644 index 0000000..e49c49b --- /dev/null +++ b/rannak/mangud/arimees/pood/pildid/9.jpg diff --git a/rannak/mangud/arimees/pood/script.js b/rannak/mangud/arimees/pood/script.js index 3b3e67b..8803bbe 100755 --- a/rannak/mangud/arimees/pood/script.js +++ b/rannak/mangud/arimees/pood/script.js @@ -4,66 +4,29 @@ document.addEventListener('DOMContentLoaded', () => { }); +const selectors = document.querySelectorAll('select'); -const kurss = 15.6; -doneCounter = 0; +for(el of selectors){ + el.addEventListener('change', () => { - -const kontrollBtns = document.querySelectorAll(".kontrolliKaarti"); -for (let nupp of kontrollBtns){ - nupp.addEventListener("click", (e) => { - let rublaHind = e.target.previousElementSibling.children[0].children[1].innerHTML; - let pakkumine = e.target.previousElementSibling.children[1].children[1].value; - - if (pakkumine*kurss == rublaHind){ - - //Change color - e.target.offsetParent.style.background = "#288654"; - e.target.previousElementSibling.children[0].style.borderRight = ".5rem solid #288654"; - e.target.previousElementSibling.children[1].style.borderLeft = ".5rem solid #288654"; - - //Change Element - - (e.target.previousElementSibling.children[1].children[1]).remove(); - const newEl = document.createElement("span"); - newEl.classList.add("symbol"); - newEl.innerHTML = pakkumine + " M"; - e.target.previousElementSibling.children[1].appendChild(newEl); - - e.target.remove(); - doneCounter++; - - - // InfoTxt - let infoTxt = document.querySelector(".infoTxt") - infoTxt.innerHTML = ""; - - if (doneCounter >= 6){ - enableAllGood(); - } + let selected = new Array(); + for (el of selectors){ + if (!selected.includes(el.value) && el.value != 'Vali') + selected.push(el.value); } - - else{ - // Inputvalue Reset - e.target.previousElementSibling.children[1].children[1].value = ""; - - // InfoTxt - let infoTxt = document.querySelector(".infoTxt") - infoTxt.style.color = "red"; - infoTxt.innerHTML = "Proovi Uuesti!"; - - } - - - - }) + if (selected.length == 6) + moveOnEnable(); + + }); } +// If All Else Done -function enableAllGood(){ +function moveOnEnable(){ const btn = document.querySelector(".moveOn"); btn.disabled = false; btn.onclick = () => location.href = ""; } + diff --git a/rannak/mangud/arimees/pood/style.css b/rannak/mangud/arimees/pood/style.css new file mode 100755 index 0000000..e4de8d1 --- /dev/null +++ b/rannak/mangud/arimees/pood/style.css @@ -0,0 +1,102 @@ +* {box-sizing: border-box;} + + +body{ + background-color: #43464b; +} + + +h1 { + color: #2FF924; + font-weight: bold; +} + +.moveOn{ + display: inline-block; + border: none; + padding: 6px 12px; + margin-botton: 0; + font-size: 1rem; + font-weight: normal; + text-align: center; + cursor: pointer; + border-radius: 4px; + background-color: #4BB543; + color: white; +} + +button:disabled{ + opacity: 0.5; + cursor: not-allowed; +} + + + + +/* Modal Stuff */ + +.avatar { + border-radius: 20px; + width: 100%; + max-width: 15rem; +} + +.modalHeaderWrapper{ + text-align: center; + margin: 0; + width: 100%; +} + + + +.closeModalButton { + border-radius: 50px; +} + +.modalButton{ + position: absolute; + top: 0; + right: 0; + padding: 6px; + padding: 9px 25px; + 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); +} + + + + + +/* Main */ + +.main { + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; +} + +.main h3 { + padding-top: 1rem; + color: white; +} + +.tab-content img{ + max-width : 50vw; + heigth: auto; +} + + +table { + padding-top: 1rem; + font-size: 1.1rem; +} diff --git a/rannak/mangud/arimees/soome/index.html b/rannak/mangud/arimees/soome/index.html index 9b14e25..824a450 100755 --- a/rannak/mangud/arimees/soome/index.html +++ b/rannak/mangud/arimees/soome/index.html @@ -14,11 +14,6 @@ <body> - <!-- Button trigger modal --> - <button id="testModal" 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>Õpime soome keelt</h1> @@ -32,6 +27,11 @@ <div class="col"> <button class="moveOn" disabled>Liigu Edasi</button> + + <!-- Button trigger modal --> + <button id="testModal" type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> + Sissejuhatus + </button> </div> </div> diff --git a/rannak/mangud/arimees/soome/style.css b/rannak/mangud/arimees/soome/style.css index 5912b9b..cb70806 100755 --- a/rannak/mangud/arimees/soome/style.css +++ b/rannak/mangud/arimees/soome/style.css @@ -59,18 +59,15 @@ button:disabled{ } .modalButton{ - position: absolute; - top: 0; - right: 0; - padding: 6px; - padding: 9px 25px; + display: inline-block; + padding: 6px 12px; + margin-left: 30px; 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; + font-size: 1rem; } .modalButton:hover{ diff --git a/rannak/mangud/kaitseliitlane/salakood/index.html b/rannak/mangud/kaitseliitlane/salakood/index.html index b40dd02..798c802 100755 --- a/rannak/mangud/kaitseliitlane/salakood/index.html +++ b/rannak/mangud/kaitseliitlane/salakood/index.html @@ -13,11 +13,6 @@ <body> - <!-- Button trigger modal --> - <button id="testModal" 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>Salakood</h1> @@ -29,6 +24,11 @@ <div class="col"> <button class="moveOn" disabled>Liigu edasi</button> + + <!-- Button trigger modal --> + <button id="testModal" type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> + Sissejuhatus + </button> </div> <div class="text-center inputBox"> diff --git a/rannak/mangud/kaitseliitlane/salakood/style.css b/rannak/mangud/kaitseliitlane/salakood/style.css index e7d79d8..13630f5 100755 --- a/rannak/mangud/kaitseliitlane/salakood/style.css +++ b/rannak/mangud/kaitseliitlane/salakood/style.css @@ -51,20 +51,36 @@ button:disabled{ } .modalButton{ - position: absolute; - top: 0; - right: 0; - padding: 6px; - padding: 9px 25px; + display: inline-block; + padding: 6px 12px; + margin-left: 30px; 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; + font-size: 1rem; +} + + +.moveOn{ + display: inline-block; + border: none; + padding: 6px 12px; + margin-botton: 0; + font-size: 1rem; + font-weight: normal; + text-align: center; + cursor: pointer; + border-radius: 4px; + background-color: #4BB543; + color: white; } + + + + .modalButton:hover{ background-color: rgba(0,136,169,0.8); } diff --git a/rannak/mangud/kaitseliitlane/sundmused/index.html b/rannak/mangud/kaitseliitlane/sundmused/index.html index 7c65863..7418239 100755 --- a/rannak/mangud/kaitseliitlane/sundmused/index.html +++ b/rannak/mangud/kaitseliitlane/sundmused/index.html @@ -19,14 +19,15 @@ <div class="row"> <div> <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> - </div> - <!-- Button trigger modal --> - <button type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> - Sissejuhatus - </button> + </div> </div> diff --git a/rannak/mangud/kaitseliitlane/sundmused/styles.css b/rannak/mangud/kaitseliitlane/sundmused/styles.css index fe4f0f9..546c8c3 100755 --- a/rannak/mangud/kaitseliitlane/sundmused/styles.css +++ b/rannak/mangud/kaitseliitlane/sundmused/styles.css @@ -82,20 +82,21 @@ img { border-radius: 50px; } + .modalButton{ - position: absolute; - top: 0; - right: 0; - padding: 25px; + display: inline-block; + padding: 6px 12px; + margin-left: 30px; 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; + font-size: 1rem; } + + .modalButton:hover{ background-color: rgba(0,136,169,0.8); } diff --git a/rannak/mangud/partorg/kuulsused/index.html b/rannak/mangud/partorg/kuulsused/index.html index 13b2cce..94f952e 100755 --- a/rannak/mangud/partorg/kuulsused/index.html +++ b/rannak/mangud/partorg/kuulsused/index.html @@ -19,15 +19,14 @@ <div class="row"> <div> <button class="moveOn" disabled>Liigu Edasi</button> - </div> + <!-- Button trigger modal --> + <button type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> + Sissejuhatus + </button> + </div> </div> - <!-- Button trigger modal --> - <button type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> - Sissejuhatus - </button> - </div> @@ -65,11 +64,11 @@ <div class="list col startBasket text-center"> - <div id="laar" class="list-item" draggable="true">Mart Laar</div> + <div id="kogan" class="list-item" draggable="true">Jevgeni Kogan</div> <div id="lauristin" class="list-item" draggable="true">Marju Lauristin</div> <div id="ruutel" class="list-item" draggable="true">Arnold Rüütel</div> + <div id="laar" class="list-item" draggable="true">Mart Laar</div> <div id="savisaar" class="list-item" draggable="true">Edgar Savisaar</div> - <div id="kogan" class="list-item" draggable="true">Jevgeni Kogan</div> <div id="valk" class="list-item" draggable="true">Heinz Valk</div> </div> diff --git a/rannak/mangud/partorg/kuulsused/styles.css b/rannak/mangud/partorg/kuulsused/styles.css index f05f71d..66f005c 100755 --- a/rannak/mangud/partorg/kuulsused/styles.css +++ b/rannak/mangud/partorg/kuulsused/styles.css @@ -25,23 +25,16 @@ h1 { width: 100%; } -.closeModalButton { - border-radius: 50px; -} - .modalButton{ - position: absolute; - top: 0; - right: 0; - padding: 6px; - padding: 9px 25px; + display: inline-block; + padding: 6px 12px; + margin-left: 30px; 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; + font-size: 1rem; } .modalButton:hover{ diff --git a/rannak/mangud/partorg/plakat/index.html b/rannak/mangud/partorg/plakat/index.html index 2f38730..85bb6bc 100755 --- a/rannak/mangud/partorg/plakat/index.html +++ b/rannak/mangud/partorg/plakat/index.html @@ -23,15 +23,15 @@ <div class="row"> <div> <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> </div> - <!-- Button trigger modal --> - <button type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> - Sissejuhatus - </button> - </div> diff --git a/rannak/mangud/partorg/plakat/styles.css b/rannak/mangud/partorg/plakat/styles.css index 7d974e1..67f8bbe 100755 --- a/rannak/mangud/partorg/plakat/styles.css +++ b/rannak/mangud/partorg/plakat/styles.css @@ -54,17 +54,15 @@ button:disabled{ } .modalButton{ - position: absolute; - top: 0; - right: 0; - padding: 25px; + display: inline-block; + padding: 6px 12px; + margin-left: 30px; 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; + font-size: 1rem; } .modalButton:hover{ diff --git a/rannak/mangud/partorg/sonaragastik/index.html b/rannak/mangud/partorg/sonaragastik/index.html index a3ec3c7..f955058 100755 --- a/rannak/mangud/partorg/sonaragastik/index.html +++ b/rannak/mangud/partorg/sonaragastik/index.html @@ -24,6 +24,11 @@ <div class="col"> <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> <div class="text-center inputBox"> @@ -37,11 +42,6 @@ </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"> diff --git a/rannak/mangud/partorg/sonaragastik/style.css b/rannak/mangud/partorg/sonaragastik/style.css index 690ad14..4b003d9 100755 --- a/rannak/mangud/partorg/sonaragastik/style.css +++ b/rannak/mangud/partorg/sonaragastik/style.css @@ -53,18 +53,15 @@ button:disabled{ } .modalButton{ - position: absolute; - top: 0; - right: 0; - padding: 6px; - padding: 9px 25px; + display: inline-block; + padding: 6px 12px; + margin-left: 30px; 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; + font-size: 1rem; } .modalButton:hover{ diff --git a/rannak/mangud/perenaine/kuulamine/index.html b/rannak/mangud/perenaine/kuulamine/index.html index 3e88521..4e44139 100755 --- a/rannak/mangud/perenaine/kuulamine/index.html +++ b/rannak/mangud/perenaine/kuulamine/index.html @@ -12,10 +12,6 @@ <body> - <!-- Button trigger modal --> - <button id="testModal" 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>Kuulamine</h1> @@ -28,6 +24,11 @@ <div class="col"> <button class="moveOn" disabled>Liigu Edasi</button> + + <!-- Button trigger modal --> + <button id="testModal" type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> + Sissejuhatus + </button> </div> </div> diff --git a/rannak/mangud/perenaine/kuulamine/style.css b/rannak/mangud/perenaine/kuulamine/style.css index 380bc00..effe5f9 100755 --- a/rannak/mangud/perenaine/kuulamine/style.css +++ b/rannak/mangud/perenaine/kuulamine/style.css @@ -47,18 +47,15 @@ button:disabled{ } .modalButton{ - position: absolute; - top: 0; - right: 0; - padding: 6px; - padding: 9px 25px; + display: inline-block; + padding: 6px 12px; + margin-left: 30px; 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; + font-size: 1rem; } .modalButton:hover{ diff --git a/rannak/mangud/perenaine/memori/style.css b/rannak/mangud/perenaine/memori/style.css index f76cfda..eebb566 100755 --- a/rannak/mangud/perenaine/memori/style.css +++ b/rannak/mangud/perenaine/memori/style.css @@ -20,7 +20,6 @@ h1 { } .moveOn{ - display: inline-block; border: none; padding: 6px 12px; margin-botton: 0; @@ -61,17 +60,17 @@ button:disabled{ } .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; + background-color: rgba(0,136,169,1); + border: none; + border-radius: 50px; + cursor: pointer; + transition: all 0.3 ease 0; + font-size: 1.2rem; + text-align: center; + position: absolute; + top: 65%; + left: 50%; + transform: translate(-50%, -50%); } .modalButton:hover{ @@ -90,6 +89,7 @@ button:disabled{ display: flex; flex-wrap: wrap; perspective: 1000px; + max-width: 70%; } .memory-card { diff --git a/rannak/mangud/perenaine/ristsona/index.html b/rannak/mangud/perenaine/ristsona/index.html index cb8ce41..0200a88 100755 --- a/rannak/mangud/perenaine/ristsona/index.html +++ b/rannak/mangud/perenaine/ristsona/index.html @@ -12,10 +12,6 @@ <body> - <!-- Button trigger modal --> - <button id="testModal" 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> @@ -29,6 +25,11 @@ <div class="col"> <button class="moveOn" disabled>Liigu Edasi</button> + + <!-- Button trigger modal --> + <button id="testModal" type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> + Sissejuhatus + </button> </div> <div class="text-center inputBox"> diff --git a/rannak/mangud/perenaine/ristsona/style.css b/rannak/mangud/perenaine/ristsona/style.css index a7732c6..dea1b5e 100755 --- a/rannak/mangud/perenaine/ristsona/style.css +++ b/rannak/mangud/perenaine/ristsona/style.css @@ -63,18 +63,15 @@ button:disabled{ } .modalButton{ - position: absolute; - top: 0; - right: 0; - padding: 6px; - padding: 9px 25px; + display: inline-block; + padding: 6px 12px; + margin-left: 30px; 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; + font-size: 1rem; } .modalButton:hover{ diff --git a/rannak/mangud/uliopilane/ajatelg/index.html b/rannak/mangud/uliopilane/ajatelg/index.html index 910756d..1f7244d 100755 --- a/rannak/mangud/uliopilane/ajatelg/index.html +++ b/rannak/mangud/uliopilane/ajatelg/index.html @@ -13,11 +13,6 @@ <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 pealkiri"> <h1 class="pb-1 pt-2">Ajatelg</h1> @@ -26,6 +21,11 @@ <div class="row"> <div> <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> </div> diff --git a/rannak/mangud/uliopilane/ajatelg/styles.css b/rannak/mangud/uliopilane/ajatelg/styles.css index e43c9d2..3c13c27 100755 --- a/rannak/mangud/uliopilane/ajatelg/styles.css +++ b/rannak/mangud/uliopilane/ajatelg/styles.css @@ -40,22 +40,19 @@ h1 { } .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; + display: inline-block; + padding: 6px 12px; + margin-left: 30px; + background-color: rgba(0,136,169,1); + border: none; + border-radius: 50px; + cursor: pointer; + transition: all 0.3 ease 0; + font-size: 1rem; } .modalButton:hover{ - background-color: rgba(0,136,169,0.8) !important; + background-color: rgba(0,136,169,0.8); } diff --git a/rannak/mangud/uliopilane/tSark/index.html b/rannak/mangud/uliopilane/tSark/index.html index 806303d..2d8bb52 100755 --- a/rannak/mangud/uliopilane/tSark/index.html +++ b/rannak/mangud/uliopilane/tSark/index.html @@ -117,7 +117,7 @@ <h4>Kirjuta tekst</h4> <label for="sargiText">Vali tekst:</label> - <input id="sargiText" type="text" placeholder="Sinu tekst siia"/> + <input id="sargiText" type="text" placeholder="Muuda teksti"/> <!-- <button id="tekstBtn" onclick="getInputValue();">Muuda Teksti</button> --> diff --git a/rannak/mangud/uliopilane/tSark/style.css b/rannak/mangud/uliopilane/tSark/style.css index 808fbb8..4da8d25 100755 --- a/rannak/mangud/uliopilane/tSark/style.css +++ b/rannak/mangud/uliopilane/tSark/style.css @@ -53,7 +53,7 @@ button:disabled{ } .checkMoveOn{ - margin: 0 25px; + margin: 0.7rem 25px; border-radius: 50px; cursor: pointer; border: none; @@ -98,15 +98,14 @@ button:disabled{ } .modalButton{ - padding: 5px; + padding: 6px 12px; margin-left: 30px; - margin-top: 3px; background-color: rgba(0,136,169,1); border: none; border-radius: 50px; cursor: pointer; transition: all 0.3 ease 0; - font-size: 1.1rem; + font-size: 1rem; } .modalButton:hover{ diff --git a/rannak/mangud/uliopilane/utlused/index.html b/rannak/mangud/uliopilane/utlused/index.html index fd3fd04..9eefd7b 100755 --- a/rannak/mangud/uliopilane/utlused/index.html +++ b/rannak/mangud/uliopilane/utlused/index.html @@ -17,11 +17,6 @@ - <!-- Button trigger modal --> - <button type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> - Sissejuhatus - </button> - <!-- Modal --> @@ -57,6 +52,11 @@ <div class="upperWrapper"> <p>Ühenda omavahel tsitaadid ja nende autorid.</p> <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> </div> diff --git a/rannak/mangud/uliopilane/utlused/utlused.css b/rannak/mangud/uliopilane/utlused/utlused.css index 47e0574..178efea 100755 --- a/rannak/mangud/uliopilane/utlused/utlused.css +++ b/rannak/mangud/uliopilane/utlused/utlused.css @@ -68,18 +68,16 @@ button:disabled{ } .modalButton{ - position: absolute; - top: 0; - right: 0; - 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: 2% !important; - font-size: 1.05rem !important; - max-width: 10% !important; + display: inline-block; + padding: 6px 12px; + margin-left: 30px; + background-color: rgba(0,136,169,1); + border: none; + border-radius: 50px; + cursor: pointer; + transition: all 0.3 ease 0; + font-size: 1rem; +} } .modalButton:hover{ |
