From 209b1915b0f1879d0055ea17f76464dddcf8089b Mon Sep 17 00:00:00 2001 From: Rasmus Luha Date: Sun, 5 Feb 2023 20:43:17 +0200 Subject: =?UTF-8?q?Hinnad=20m=C3=A4ng=20for=20Arimees=20+=20fonts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hinnad/fonts/1001fonts-eutemia-i-eula.txt | 31 ++ rannak/mangud/arimees/hinnad/fonts/Eutemia.ttf | Bin 0 -> 32564 bytes rannak/mangud/arimees/hinnad/index.html | 223 +++++++++ rannak/mangud/arimees/hinnad/pildid/avatar.png | Bin 0 -> 73556 bytes rannak/mangud/arimees/hinnad/pildid/kingad.png | Bin 0 -> 2672289 bytes rannak/mangud/arimees/hinnad/pildid/kohver.png | Bin 0 -> 5128984 bytes rannak/mangud/arimees/hinnad/pildid/kupsis.png | Bin 0 -> 64952 bytes rannak/mangud/arimees/hinnad/pildid/laud.png | Bin 0 -> 1280042 bytes rannak/mangud/arimees/hinnad/pildid/sai.png | Bin 0 -> 2596703 bytes rannak/mangud/arimees/hinnad/pildid/tugitool.png | Bin 0 -> 5801727 bytes rannak/mangud/arimees/hinnad/script.js | 69 +++ rannak/mangud/arimees/hinnad/styles.css | 175 +++++++ rannak/mangud/index.html | 4 +- .../kaitseliitlane/salakood/fonts/mrs-monster.zip | Bin 0 -> 1434335 bytes .../kaitseliitlane/salakood/fonts/mrsmonster.ttf | Bin 0 -> 115284 bytes .../kaitseliitlane/salakood/fonts/mrsmonster.txt | 15 + .../kaitseliitlane/salakood/fonts/mrsmonster3d.ttf | Bin 0 -> 223972 bytes .../salakood/fonts/mrsmonster3dital.ttf | Bin 0 -> 232060 bytes .../salakood/fonts/mrsmonsteracad.ttf | Bin 0 -> 275136 bytes .../salakood/fonts/mrsmonsterboldout.ttf | Bin 0 -> 218324 bytes .../salakood/fonts/mrsmonsterboldoutital.ttf | Bin 0 -> 224576 bytes .../salakood/fonts/mrsmonstercond.ttf | Bin 0 -> 113584 bytes .../salakood/fonts/mrsmonstercondital.ttf | Bin 0 -> 119532 bytes .../salakood/fonts/mrsmonsterexpand.ttf | Bin 0 -> 116844 bytes .../salakood/fonts/mrsmonsterexpandital.ttf | Bin 0 -> 122036 bytes .../salakood/fonts/mrsmonsterital.ttf | Bin 0 -> 120988 bytes .../salakood/fonts/mrsmonsterleft.ttf | Bin 0 -> 120788 bytes .../salakood/fonts/mrsmonsterout.ttf | Bin 0 -> 192868 bytes .../salakood/fonts/mrsmonsteroutital.ttf | Bin 0 -> 201332 bytes .../salakood/fonts/mrsmonsterrotal.ttf | Bin 0 -> 125136 bytes .../salakood/fonts/mrsmonsterrotate.ttf | Bin 0 -> 123924 bytes .../salakood/fonts/mrsmonsterrotate2.ttf | Bin 0 -> 124760 bytes rannak/mangud/kaitseliitlane/salakood/index.html | 8 +- rannak/mangud/kaitseliitlane/salakood/script.js | 5 + rannak/mangud/kaitseliitlane/salakood/style.css | 88 ++-- rannak/mangud/kaitseliitlane/sundmused/index.html | 5 +- rannak/mangud/kaitseliitlane/sundmused/styles.css | 49 +- rannak/mangud/partorg/kuulsused/index.html | 5 +- rannak/mangud/partorg/kuulsused/styles.css | 62 +-- rannak/mangud/partorg/plakat/img/lenin.png | Bin 0 -> 37366 bytes rannak/mangud/partorg/plakat/img/nazi.png | Bin 0 -> 20381 bytes rannak/mangud/partorg/plakat/img/normalSelect.cur | Bin 0 -> 4286 bytes rannak/mangud/partorg/plakat/img/redStar.png | Bin 0 -> 39590 bytes rannak/mangud/partorg/plakat/img/stalinAddOn.png | Bin 0 -> 976997 bytes rannak/mangud/partorg/plakat/index.html | 64 ++- rannak/mangud/partorg/plakat/main.js | 83 +++- rannak/mangud/partorg/plakat/style.css | 93 +++- rannak/mangud/partorg/sonaragastik/index.html | 31 +- rannak/mangud/partorg/sonaragastik/script.js | 4 +- rannak/mangud/partorg/sonaragastik/style.css | 77 +-- rannak/mangud/perenaine/memori/img/alko.svg | 38 +- rannak/mangud/perenaine/memori/img/alko.svg.bak | 1 + rannak/mangud/perenaine/memori/img/riis.svg.bak | 14 - rannak/mangud/perenaine/memori/index.html | 4 +- rannak/mangud/perenaine/memori/style.css | 9 + rannak/mangud/perenaine/ristsona/index.html | 7 +- rannak/mangud/perenaine/ristsona/script.js | 5 + rannak/mangud/perenaine/ristsona/style.css | 49 +- rannak/mangud/uliopilane/ajatelg/index.html | 5 +- rannak/mangud/uliopilane/ajatelg/styles.css | 16 +- rannak/mangud/uliopilane/tSark/index.html | 17 +- rannak/mangud/uliopilane/tSark/main.js | 199 +++++--- rannak/mangud/uliopilane/tSark/main.js.bak | 537 +++++++++++++++++++++ rannak/mangud/uliopilane/tSark/style.css | 80 ++- rannak/mangud/uliopilane/utlused/index.html | 21 +- rannak/mangud/uliopilane/utlused/utlused.css | 19 +- 66 files changed, 1768 insertions(+), 344 deletions(-) create mode 100644 rannak/mangud/arimees/hinnad/fonts/1001fonts-eutemia-i-eula.txt create mode 100644 rannak/mangud/arimees/hinnad/fonts/Eutemia.ttf create mode 100644 rannak/mangud/arimees/hinnad/index.html create mode 100644 rannak/mangud/arimees/hinnad/pildid/avatar.png create mode 100644 rannak/mangud/arimees/hinnad/pildid/kingad.png create mode 100644 rannak/mangud/arimees/hinnad/pildid/kohver.png create mode 100644 rannak/mangud/arimees/hinnad/pildid/kupsis.png create mode 100644 rannak/mangud/arimees/hinnad/pildid/laud.png create mode 100644 rannak/mangud/arimees/hinnad/pildid/sai.png create mode 100644 rannak/mangud/arimees/hinnad/pildid/tugitool.png create mode 100644 rannak/mangud/arimees/hinnad/script.js create mode 100644 rannak/mangud/arimees/hinnad/styles.css create mode 100644 rannak/mangud/kaitseliitlane/salakood/fonts/mrs-monster.zip create mode 100644 rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster.ttf create mode 100644 rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster.txt create mode 100644 rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster3d.ttf create mode 100644 rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster3dital.ttf create mode 100644 rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsteracad.ttf create mode 100644 rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterboldout.ttf create mode 100644 rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterboldoutital.ttf create mode 100644 rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonstercond.ttf create mode 100644 rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonstercondital.ttf create mode 100644 rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterexpand.ttf create mode 100644 rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterexpandital.ttf create mode 100644 rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterital.ttf create mode 100644 rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterleft.ttf create mode 100644 rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterout.ttf create mode 100644 rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsteroutital.ttf create mode 100644 rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotal.ttf create mode 100644 rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotate.ttf create mode 100644 rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotate2.ttf create mode 100644 rannak/mangud/partorg/plakat/img/lenin.png create mode 100644 rannak/mangud/partorg/plakat/img/nazi.png create mode 100644 rannak/mangud/partorg/plakat/img/normalSelect.cur create mode 100644 rannak/mangud/partorg/plakat/img/redStar.png create mode 100644 rannak/mangud/partorg/plakat/img/stalinAddOn.png create mode 100644 rannak/mangud/perenaine/memori/img/alko.svg.bak delete mode 100644 rannak/mangud/perenaine/memori/img/riis.svg.bak create mode 100644 rannak/mangud/uliopilane/tSark/main.js.bak (limited to 'rannak') diff --git a/rannak/mangud/arimees/hinnad/fonts/1001fonts-eutemia-i-eula.txt b/rannak/mangud/arimees/hinnad/fonts/1001fonts-eutemia-i-eula.txt new file mode 100644 index 0000000..b3cf91f --- /dev/null +++ b/rannak/mangud/arimees/hinnad/fonts/1001fonts-eutemia-i-eula.txt @@ -0,0 +1,31 @@ +1001Fonts Free For Commercial Use License (FFC) + +Preamble +In this license, 'Eutemia I' refers to the given .zip file, which may contain one or numerous fonts. These fonts can be of any type (.ttf, .otf, ...) and together they form a 'font family' or in short a 'typeface'. + +1. Copyright +Eutemia I is the intellectual property of its respective author, provided it is original, and is protected by copyright laws in many parts of the world. + +2. Usage +Eutemia I may be downloaded and used free of charge for both personal and commercial use. Personal use refers to all usage that does not generate financial income in a business manner, for instance: + + - personal scrapbooking for yourself + - recreational websites and blogs for friends and family + - prints such as flyers, posters, t-shirts for churches, charities, and non-profit organizations + +Commercial use refers to usage in a business environment, including: + + - business cards, logos, advertising, websites for companies + - t-shirts, books, apparel that will be sold for money + - flyers, posters for events that charge admission + - freelance graphic design work + - anything that will generate direct or indirect income + +3. Modification +Eutemia I may not be modified, altered, adapted or built upon without written permission by its respective author. This pertains all files within the downloadable font zip-file. + +4. Distribution +While Eutemia I may freely be copied and passed along to other individuals for private use as its original downloadable zip-file, it may not be sold or published without written permission by its respective author. + +5. Disclaimer +Eutemia I is offered 'as is' without any warranty. 1001fonts.com and the respective author of Eutemia I shall not be liable for any damage derived from using this typeface. By using Eutemia I you agree to the terms of this license. \ No newline at end of file diff --git a/rannak/mangud/arimees/hinnad/fonts/Eutemia.ttf b/rannak/mangud/arimees/hinnad/fonts/Eutemia.ttf new file mode 100644 index 0000000..c575e59 Binary files /dev/null and b/rannak/mangud/arimees/hinnad/fonts/Eutemia.ttf differ diff --git a/rannak/mangud/arimees/hinnad/index.html b/rannak/mangud/arimees/hinnad/index.html new file mode 100644 index 0000000..5b01902 --- /dev/null +++ b/rannak/mangud/arimees/hinnad/index.html @@ -0,0 +1,223 @@ + + + + + + Hinnad + + + + + + + +
+

Hinnad

+

Leia toodete tolleaegne hind Eesti Markades, kasutades Rubla ja Marga vahelist kurssi.

+
+
+ +
+ +
+ + + +
+ + + + + + + +

Kurss: 1 Mark = 15.6 Rubla

+
+ + + +
+ +
+ Tugitool +
+

Tugitool

+ +
+
+

Rublades

+ 109.2 + ₽ +
+
+

Markades

+ +
+
+ + + +
+
+ + + + +
+ Laud +
+

Laud

+ +
+
+

Rublades

+ 62.4 + ₽ +
+
+

Markades

+ +
+
+ + + +
+
+ + + + + +
+ Küpsised +
+

Küpsised

+ +
+
+

Rublades

+ 140.4 + ₽ +
+
+

Markades

+ +
+
+ + + +
+
+ + + + +
+ Sai +
+

Saiapäts

+ +
+
+

Rublades

+ 78 + ₽ +
+
+

Markades

+ +
+
+ + + +
+
+ + + + +
+ Kohver +
+

Kohver

+ +
+
+

Rublades

+ 156 + ₽ +
+
+

Markades

+ +
+
+ + + +
+
+ + + + + +
+ Kingad +
+

Kingad

+ +
+
+

Rublades

+ 312 + ₽ +
+
+

Markades

+ +
+
+ + + +
+
+ + +
+ + + + + + + + + diff --git a/rannak/mangud/arimees/hinnad/pildid/avatar.png b/rannak/mangud/arimees/hinnad/pildid/avatar.png new file mode 100644 index 0000000..3cb21cf Binary files /dev/null and b/rannak/mangud/arimees/hinnad/pildid/avatar.png differ diff --git a/rannak/mangud/arimees/hinnad/pildid/kingad.png b/rannak/mangud/arimees/hinnad/pildid/kingad.png new file mode 100644 index 0000000..ef106ae Binary files /dev/null and b/rannak/mangud/arimees/hinnad/pildid/kingad.png differ diff --git a/rannak/mangud/arimees/hinnad/pildid/kohver.png b/rannak/mangud/arimees/hinnad/pildid/kohver.png new file mode 100644 index 0000000..485b6db Binary files /dev/null and b/rannak/mangud/arimees/hinnad/pildid/kohver.png differ diff --git a/rannak/mangud/arimees/hinnad/pildid/kupsis.png b/rannak/mangud/arimees/hinnad/pildid/kupsis.png new file mode 100644 index 0000000..2419f89 Binary files /dev/null and b/rannak/mangud/arimees/hinnad/pildid/kupsis.png differ diff --git a/rannak/mangud/arimees/hinnad/pildid/laud.png b/rannak/mangud/arimees/hinnad/pildid/laud.png new file mode 100644 index 0000000..e3036dc Binary files /dev/null and b/rannak/mangud/arimees/hinnad/pildid/laud.png differ diff --git a/rannak/mangud/arimees/hinnad/pildid/sai.png b/rannak/mangud/arimees/hinnad/pildid/sai.png new file mode 100644 index 0000000..8add13c Binary files /dev/null and b/rannak/mangud/arimees/hinnad/pildid/sai.png differ diff --git a/rannak/mangud/arimees/hinnad/pildid/tugitool.png b/rannak/mangud/arimees/hinnad/pildid/tugitool.png new file mode 100644 index 0000000..c48bd50 Binary files /dev/null and b/rannak/mangud/arimees/hinnad/pildid/tugitool.png differ diff --git a/rannak/mangud/arimees/hinnad/script.js b/rannak/mangud/arimees/hinnad/script.js new file mode 100644 index 0000000..3b3e67b --- /dev/null +++ b/rannak/mangud/arimees/hinnad/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/hinnad/styles.css b/rannak/mangud/arimees/hinnad/styles.css new file mode 100644 index 0000000..5e02923 --- /dev/null +++ b/rannak/mangud/arimees/hinnad/styles.css @@ -0,0 +1,175 @@ +@font-face { + font-family: 'fontDos'; + src: local('fonts/Eutemia.ttf'); +} + + + +* {box-sizing: border-box;} + +body{ + background-color: #4D5157; + font-family: "fontDos" +} +h1{ + color: #2FF924; + font-weight: bold; +} + +/* Modal Stuff */ + +.avatar { + border-radius: 20px; + width: 100%; +} + +.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); +} + +/* To unduck chrome modal pic size */ +.modal-header img { + max-width: 15rem; + height: auto; + padding: .3rem; +} + + + + + +/* Move On */ + +.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; +} + + + +/* Pood Itself */ +.main { + padding: 1% 10%; + display: flex; + flex-wrap: wrap; + justify-content: center; +} + +h3, h5 { + text-align: center; +} + + + + + +/* PoeKaart */ + +.card { + margin: 2rem .5rem; + padding: .5rem; + width: calc(20% - 1rem); + color: black; + background-color: #D22730; +} + +.card img { + height: 57%; +} + + +.card-body{ + padding: 0; + margin: 0; +} +.cardInnerWrapper { + background-color: white; + display:flex; + paddig: 0; + margin: 0; +} + +.rublaHind, .symbol{ + font-size: 1.5rem; +} + +.uno { + width: 50%; + border-right: .5rem solid #D22730; +} + +.dos { + border-left: .5rem solid #D22730; + width: 50%; +} + +.dos input { + width: 80%; + margin-bottom: 1rem; +} + +.kontrolliKaarti{ + margin-top: 1rem; + display: inline-block; + border: none; + padding: 3px 6px; + margin-botton: 0; + font-size: 1.07rem; + font-weight: normal; + text-align: center; + cursor: pointer; + border-radius: 4px; + background-color: #006E33; + color: white; +} + + + + + +/* Media Querries*/ + +@media screen and (max-width: 1650px) { + .card{ + width: calc(25% - 1rem); + } +} diff --git a/rannak/mangud/index.html b/rannak/mangud/index.html index 9d592d2..9ce5578 100644 --- a/rannak/mangud/index.html +++ b/rannak/mangud/index.html @@ -1,5 +1,7 @@ + + @@ -52,7 +54,7 @@

Ärimees

    -
  1. +
  2. Hinnad
diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrs-monster.zip b/rannak/mangud/kaitseliitlane/salakood/fonts/mrs-monster.zip new file mode 100644 index 0000000..2addc91 Binary files /dev/null and b/rannak/mangud/kaitseliitlane/salakood/fonts/mrs-monster.zip differ diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster.ttf new file mode 100644 index 0000000..1d91c69 Binary files /dev/null and b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster.ttf differ diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster.txt b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster.txt new file mode 100644 index 0000000..822341c --- /dev/null +++ b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster.txt @@ -0,0 +1,15 @@ +Mrs. Monster Version 1.0 Truetype Font for Windows + +2013 Iconian Fonts - Daniel Zadorozny + +http://www.iconian.com/ + +This font comes with the following 17 versions: Regular, Italic, Condensed, Condensed Italic, Expanded, Expanded Italic, Outline, Outline Italic, Bold Outline, Bold Outline Italic, 3D, 3D Italic, Academy, Rotated, Rotated 2, Rotalic and Leftalic. + +This font may be freely distributed and is free for all non-commercial uses. Use of the fonts are at your own risk. + +For commercial use of the font please visit http://iconian.com/commercial.html for additional information. + +This font is e-mailware; that is, if you like it, please e-mail the author at: + +iconian@aol.com diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster3d.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster3d.ttf new file mode 100644 index 0000000..475464a Binary files /dev/null and b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster3d.ttf differ diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster3dital.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster3dital.ttf new file mode 100644 index 0000000..81a1270 Binary files /dev/null and b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonster3dital.ttf differ diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsteracad.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsteracad.ttf new file mode 100644 index 0000000..0dcc133 Binary files /dev/null and b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsteracad.ttf differ diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterboldout.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterboldout.ttf new file mode 100644 index 0000000..78c7b2a Binary files /dev/null and b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterboldout.ttf differ diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterboldoutital.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterboldoutital.ttf new file mode 100644 index 0000000..d020cdb Binary files /dev/null and b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterboldoutital.ttf differ diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonstercond.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonstercond.ttf new file mode 100644 index 0000000..ee09ea5 Binary files /dev/null and b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonstercond.ttf differ diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonstercondital.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonstercondital.ttf new file mode 100644 index 0000000..4df768e Binary files /dev/null and b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonstercondital.ttf differ diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterexpand.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterexpand.ttf new file mode 100644 index 0000000..71d0c61 Binary files /dev/null and b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterexpand.ttf differ diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterexpandital.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterexpandital.ttf new file mode 100644 index 0000000..9595754 Binary files /dev/null and b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterexpandital.ttf differ diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterital.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterital.ttf new file mode 100644 index 0000000..1926ba8 Binary files /dev/null and b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterital.ttf differ diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterleft.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterleft.ttf new file mode 100644 index 0000000..1ad20b9 Binary files /dev/null and b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterleft.ttf differ diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterout.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterout.ttf new file mode 100644 index 0000000..7c8b324 Binary files /dev/null and b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterout.ttf differ diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsteroutital.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsteroutital.ttf new file mode 100644 index 0000000..bb3b52f Binary files /dev/null and b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsteroutital.ttf differ diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotal.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotal.ttf new file mode 100644 index 0000000..f6aa01c Binary files /dev/null and b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotal.ttf differ diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotate.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotate.ttf new file mode 100644 index 0000000..b58d711 Binary files /dev/null and b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotate.ttf differ diff --git a/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotate2.ttf b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotate2.ttf new file mode 100644 index 0000000..48ad7e7 Binary files /dev/null and b/rannak/mangud/kaitseliitlane/salakood/fonts/mrsmonsterrotate2.ttf differ diff --git a/rannak/mangud/kaitseliitlane/salakood/index.html b/rannak/mangud/kaitseliitlane/salakood/index.html index 44bac05..72db2ff 100644 --- a/rannak/mangud/kaitseliitlane/salakood/index.html +++ b/rannak/mangud/kaitseliitlane/salakood/index.html @@ -5,9 +5,10 @@ Salakood - + + @@ -82,7 +83,7 @@
- +
avatar
@@ -105,11 +106,10 @@ +

Sõnum...

-
- diff --git a/rannak/mangud/kaitseliitlane/salakood/script.js b/rannak/mangud/kaitseliitlane/salakood/script.js index 1945187..5925a0b 100644 --- a/rannak/mangud/kaitseliitlane/salakood/script.js +++ b/rannak/mangud/kaitseliitlane/salakood/script.js @@ -31,6 +31,11 @@ function clickEventAdder(){ if (node != curNode && node.classList.contains("selected")) node.classList.remove("selected"); } + + // Bring cursor to input + document.querySelector("input").focus(); + document.querySelector("input").select(); + }); } // outerFor diff --git a/rannak/mangud/kaitseliitlane/salakood/style.css b/rannak/mangud/kaitseliitlane/salakood/style.css index 8a084d2..5da43dc 100644 --- a/rannak/mangud/kaitseliitlane/salakood/style.css +++ b/rannak/mangud/kaitseliitlane/salakood/style.css @@ -3,13 +3,22 @@ src: url('fonts/28DaysLater.ttf'); } +@font-face { + font-family: 'fontUno'; + src: url('fonts/mrsmonster.ttf'); +} + + * { box-sizing: border-box; } body{ - background-color: #212121 !important; + background-color: #4D5157; +} +h1 { + color: #154734; } .moveOn{ @@ -31,30 +40,20 @@ button:disabled{ cursor: not-allowed; } -/* Retsept Lõpus*/ - -.retsept { - margin-top: 5%; - width:60%; - color: #AFFF80; - text-align: center; - font-size: 1.2rem; -} - /* Modal Stuff */ .avatar { border-radius: 20px; - width: 100% !important; - max-width: 15rem !important; + width: 100%; + max-width: 15rem; } .modalHeaderWrapper{ text-align: center; - margin: 0 !important; - width: 100% !important; + margin: 0; + width: 100%; } @@ -69,17 +68,17 @@ button:disabled{ 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; + 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) !important; + background-color: rgba(0,136,169,0.8); } @@ -90,7 +89,7 @@ input { } .inputBox{ - margin-top: 10px !important; + margin-top: 10px; } .subBtn{ @@ -117,13 +116,24 @@ input { .infoWrapper{ color: white; margin: 1rem; + font-size: 1.4rem; +} + +.infoWrapper .infoTxt { + font-size: 1.1rem; } -span, h6, table, h1{ +span, h6, table, h1, h2{ font-family:'fontUno'; } +h2 { + color: white; + margin-left: 7%; +} + + /* Main */ .main { @@ -142,36 +152,44 @@ span, h6, table, h1{ } td { - width: 4rem !important; - height: 4rem !important; + width: 4rem; + height: 4rem; font-weight: bold; - border-radius: 20px !important; + border-radius: 20px; } + /* Responsivness */ @media screen and (max-width: 1700px) { td { - width: 3rem !important; - height: 3rem !important; + width: 4.5rem; + height: 4.5rem; + font-size: 1.5rem; } - .main {margin-top: 4rem;} + h2 {margin-top: 4rem;} + .infoWrapper{font-size: 1.6rem;} } @media screen and (max-width: 1500px) { td { - width: 2rem !important; - height: 2rem !important; + width: 4rem; + height: 4rem; + font-size: 1.4rem; } + + .infoWrapper{font-size: 1.5rem;} } @media screen and (min-width: 1900px) { - .main { - margin-top: 5rem; + h2{ + margin-top: 5.5rem; } + .infoWrapper{font-size: 1.7rem;} + id {font-size: 1.6rem;} } diff --git a/rannak/mangud/kaitseliitlane/sundmused/index.html b/rannak/mangud/kaitseliitlane/sundmused/index.html index d2225b6..3e83187 100644 --- a/rannak/mangud/kaitseliitlane/sundmused/index.html +++ b/rannak/mangud/kaitseliitlane/sundmused/index.html @@ -4,12 +4,13 @@ Kuusused - + + - +

Sündmused

diff --git a/rannak/mangud/kaitseliitlane/sundmused/styles.css b/rannak/mangud/kaitseliitlane/sundmused/styles.css index 5e2d661..fe4f0f9 100644 --- a/rannak/mangud/kaitseliitlane/sundmused/styles.css +++ b/rannak/mangud/kaitseliitlane/sundmused/styles.css @@ -1,5 +1,12 @@ * { - box-sizing: border-box !important; + box-sizing: border-box; +} +h1 { + color: #154734; + font-weight: bold; +} +body{ + background-color: #4D5157; } .moveOn{ @@ -22,22 +29,22 @@ button:disabled{ } .row { - margin: 0 5% !important; + margin: 0 5%; } img { - max-width: 100% !important; - height: auto !important; + max-width: 100%; + height: auto; padding: .3rem; } .lists .list .list-item { - background-color: #b2beb5 !important; + background-color: #b2beb5; color: #21201E; margin: 0.5rem 0; height: 2.5rem; - border-radius: 8px !important; + border-radius: 8px; cursor: pointer; } @@ -45,11 +52,11 @@ img { background-color: rgba(0, 0, 0, 0.3); min-height: 2.5rem; margin: .5rem; - border-radius: 8px !important; + border-radius: 8px; } .startBasket { - height: 100% !important; + height: 100%; min-height: 2rem; } @@ -58,14 +65,14 @@ img { .avatar { border-radius: 20px; - width: 100% !important; - max-width: 15rem !important; + width: 100%; + max-width: 15rem; } .modalHeaderWrapper{ text-align: center; - margin: 0 !important; - width: 100% !important; + margin: 0; + width: 100%; } @@ -79,16 +86,16 @@ img { 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; + padding: 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) !important; + 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 b0503a2..80fc8c9 100644 --- a/rannak/mangud/partorg/kuulsused/index.html +++ b/rannak/mangud/partorg/kuulsused/index.html @@ -4,12 +4,13 @@ Kuulsused - + + - +

Olulised isikud

diff --git a/rannak/mangud/partorg/kuulsused/styles.css b/rannak/mangud/partorg/kuulsused/styles.css index 108bde9..f05f71d 100644 --- a/rannak/mangud/partorg/kuulsused/styles.css +++ b/rannak/mangud/partorg/kuulsused/styles.css @@ -1,22 +1,28 @@ * { - box-sizing: border-box !important; + box-sizing: border-box; +} +body{background-color: #4D5157;} + +h1 { + color: #a1000e; + font-weight: bold; } .lists{ - margin-bottom: 20px !important; + margin-bottom: 20px; } /* Modal Stuff */ .avatar { border-radius: 20px; - width: 100% !important; + width: 100%; } .modalHeaderWrapper{ text-align: center; - margin: 0 !important; - width: 100% !important; + margin: 0; + width: 100%; } .closeModalButton { @@ -29,17 +35,17 @@ 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; + 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) !important; + background-color: rgba(0,136,169,0.8); } @@ -86,35 +92,35 @@ button:disabled{ .carousel { border-left: 5px solid white; - padding: 1rem !important; - margin: auto !important; - width: 60% !important; - height: auto !important; + padding: 1rem; + margin: auto; + width: 60%; + height: auto; } -.carousel-item{text-align: center !important;} -.carousel-item .text{padding-top: 10px !important;} +.carousel-item{text-align: center;} +.carousel-item .text{padding-top: 10px;} .carousel-item img{ - margin: auto !important; - max-width: 35% !important; - height: auto !important; + margin: auto; + max-width: 35% ; + height: auto; } .carousel-item .list { background-color: rgba(0, 0, 0, 0.3); min-height: 3.7rem; margin: .5rem; - border-radius: 8px !important; + border-radius: 8px; } .list-item { - background-color: #b2beb5 !important; + background-color: #b2beb5; color: #21201E; margin: 0.5rem 0; height: 2.5rem; - border-radius: 8px !important; + border-radius: 8px; cursor: pointer; } @@ -123,12 +129,12 @@ button:disabled{ /* Other */ .modal-header img { - max-width: 15rem !important; - height: auto !important; + max-width: 15rem; + height: auto; padding: .3rem; } .startBasket { - height: 100% !important; + height: 100%; min-height: 2rem; } diff --git a/rannak/mangud/partorg/plakat/img/lenin.png b/rannak/mangud/partorg/plakat/img/lenin.png new file mode 100644 index 0000000..e36df3d Binary files /dev/null and b/rannak/mangud/partorg/plakat/img/lenin.png differ diff --git a/rannak/mangud/partorg/plakat/img/nazi.png b/rannak/mangud/partorg/plakat/img/nazi.png new file mode 100644 index 0000000..87e616e Binary files /dev/null and b/rannak/mangud/partorg/plakat/img/nazi.png differ diff --git a/rannak/mangud/partorg/plakat/img/normalSelect.cur b/rannak/mangud/partorg/plakat/img/normalSelect.cur new file mode 100644 index 0000000..fdd943c Binary files /dev/null and b/rannak/mangud/partorg/plakat/img/normalSelect.cur differ diff --git a/rannak/mangud/partorg/plakat/img/redStar.png b/rannak/mangud/partorg/plakat/img/redStar.png new file mode 100644 index 0000000..b6eee79 Binary files /dev/null and b/rannak/mangud/partorg/plakat/img/redStar.png differ diff --git a/rannak/mangud/partorg/plakat/img/stalinAddOn.png b/rannak/mangud/partorg/plakat/img/stalinAddOn.png new file mode 100644 index 0000000..d3e05fd Binary files /dev/null and b/rannak/mangud/partorg/plakat/img/stalinAddOn.png differ diff --git a/rannak/mangud/partorg/plakat/index.html b/rannak/mangud/partorg/plakat/index.html index a15849e..9f1416b 100644 --- a/rannak/mangud/partorg/plakat/index.html +++ b/rannak/mangud/partorg/plakat/index.html @@ -3,12 +3,11 @@ - Plakat - +
@@ -17,7 +16,7 @@

Kujunda Plakatit

-

Vali Välja Üks plakat ja muuda/lisa selle kujundust vastavalt enda äranägemise järgi

+

Vali välja üks plakat ja muuda/lisa selle kujundust vastavalt enda äranägemisele.

@@ -25,22 +24,27 @@ Sissejuhatus +
-
-

- - -

- -

- - -

- - +
+
+

+ + +

+ +

+ + +

+ + + +
- @@ -50,8 +54,21 @@ Veekogude Plakat
+ + +

Vali Lisasid

+
+ red star + lenin + Nazi Flag + Stalin +
+
- + + + +
@@ -76,7 +93,18 @@
- Fames ac turpis egestas maecenas pharetra convallis posuere morbi leo urna, molestie at elementum eu, facilisis sed odio morbi quis commodo odio aenean sed adipiscing! + Peale ajalehe väljalõigete olen aastate jooksul kogunud ja säilitanud meeleolukaid plakateid nõukogudeaja kuldsest elust. +
+ Jagan siinkohal teiega, seltsimehed noored, nelja nendest. Plakatid on pärit erinevatest aastakümnetest:
1950ndad, 1960ndad, 1970ndad ja 1980ndad aastad. +
+
+ Palun uurige nende plakatite sisu ja vormi. +
+ Õppige, õppige, õppige! Kas tajute, millisesse kümnendisse iga plakat kuulub? +

+ + Mõelge plakatitele välja uus, kaasaega sobiv lööklause. Samuti kaunistage ja täiendage plakatit kaasaegsete kunsiliste detailidega. Ka huumor on lubatud! +
diff --git a/rannak/mangud/partorg/plakat/main.js b/rannak/mangud/partorg/plakat/main.js index 48626c6..9ae8e54 100644 --- a/rannak/mangud/partorg/plakat/main.js +++ b/rannak/mangud/partorg/plakat/main.js @@ -4,6 +4,7 @@ document.addEventListener('DOMContentLoaded', () => { }); +console.log("FAAAAK"); /* Inital Setup*/ @@ -25,12 +26,16 @@ function copyImageToCanvas(image, x, y) { ctx.drawImage(image, 0, 0, canvas.width, canvas.height) } + + + // Initial Drawring setTimeout(() => { copyImageToCanvas(CurImage, canvasOffsetX, canvasOffsetY); }, 300); + window.onresize = () => { canvasOffsetX = canvas.offsetLeft; canvasOffsetY = canvas.offsetTop; @@ -44,20 +49,45 @@ window.onresize = () => { /* EventHandlers and stuff*/ +let addOnHasBeenAdded = false; +let addOnActive = false; +let newAddOn; +let hasPainted = false; + let isPainting = false; let lineWidth = 5; let startX; let startY; +const pildid = new Array(); +const addOns = new Array(); + toolbar.addEventListener('click', e => { + + //Plakatid const stalinImg = document.getElementById("stalin"); const veekogudImg = document.getElementById("veekogud"); - const pildid = new Array(); pildid.push(stalinImg); pildid.push(veekogudImg); + + //Addons + + const naziImg = document.getElementById("nazi"); + const lenin = document.getElementById("lenin"); + const redStar = document.getElementById("redStar"); + const stalinAddOn = document.getElementById("stalinAddOn"); + + addOns.push(naziImg); + addOns.push(lenin); + addOns.push(redStar); + addOns.push(stalinAddOn); + + + + if (e.target.id === "stalin" || e.target.id === "veekogud") { for (el in pildid) { pildid[el].classList.remove("picked"); @@ -72,17 +102,60 @@ toolbar.addEventListener('click', e => { } - if (e.target.id === 'clear') { + else if (e.target.id === 'clear') { ctx.clearRect(0, 0, canvas.width, canvas.height); copyImageToCanvas(CurImage, canvasOffsetX, canvasOffsetY); moveOnDisable(); } + + else if (e.target.id === 'nazi' || e.target.id === 'lenin' || e.target.id === 'redStar' || e.target.id === 'stalinAddOn') { + addOnActive = true; + document.body.style.cursor = "url('img/normalSelect.cur'), auto"; + + for (el in addOns) { + addOns[el].classList.remove("addOnPicked"); + } + + newAddOn = document.getElementById(e.target.id); + newAddOn.classList.add("addOnPicked"); + } + + +}); + + + +canvas.addEventListener('click', e => { + + if(addOnActive == true){ + addOnActive = false; + document.body.style.cursor = "auto"; + + for (el in addOns) { + addOns[el].classList.remove("addOnPicked"); + } + + let xCord = e.offsetX - (newAddOn.clientWidth / 2) + let yCord = e.offsetY - (newAddOn.clientHeight / 2) + ctx.drawImage(newAddOn, xCord, yCord, newAddOn.clientWidth, newAddOn.clientHeight); + + + addOnHasBeenAdded = true; + if (hasPainted) + moveOnEnable(); + } }); + + + + + /* Drawing stuff from here */ + toolbar.addEventListener('change', e => { if(e.target.id === 'stroke') { ctx.strokeStyle = e.target.value; @@ -108,7 +181,9 @@ const draw = (e) => { //ctx.lineTo(e.clientX - abiOffset, e.clientY); ctx.stroke(); - moveOnEnable(); + hasPainted = true; + if (addOnHasBeenAdded) + moveOnEnable(); } @@ -132,8 +207,8 @@ canvas.addEventListener('mousemove', draw); -// Move On Stuff +// Move On Stuff function moveOnEnable(){ const btn = document.querySelector(".moveOn"); diff --git a/rannak/mangud/partorg/plakat/style.css b/rannak/mangud/partorg/plakat/style.css index bc5c2c4..215c073 100644 --- a/rannak/mangud/partorg/plakat/style.css +++ b/rannak/mangud/partorg/plakat/style.css @@ -1,7 +1,13 @@ body { - height: 100% !important; - overflow: hidden !important; - color: white !important; + height: 100%; + overflow: hidden; + color: white; + background-color: #43464b; +} + +h1 { + color: #a1000e; + font-weight: bold; } @@ -9,15 +15,15 @@ body { .avatar { border-radius: 20px; - width: 100% !important; - max-width: 15rem !important; + width: 100%; + max-width: 15rem; } .modalHeaderWrapper{ text-align: center; - margin: 0 !important; - width: 100% !important; + margin: 0; + width: 100%; } button:disabled{ @@ -47,18 +53,18 @@ 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; - margin-left: 30px !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; + margin-left: 30px; } .modalButton:hover{ - background-color: rgba(0,136,169,0.8) !important; + background-color: rgba(0,136,169,0.8); } @@ -71,7 +77,6 @@ button:disabled{ } /* Toolbar */ - .intro{ text-align: center; border-bottom: 2px solid gray; @@ -86,7 +91,7 @@ button:disabled{ padding: 5px; width: 20%; min-width:350px; - background-color: #202020; + background-color: #43464b; } #clear{ @@ -99,14 +104,18 @@ button:disabled{ } #toolbar * {margin-bottom: 6px;} -#toolbar input {width: 50%;} +#toolbar input {width: 4rem;} + +.toolbarDiv {width: 100%;} + +form { + display: flex; + align-items: center; +} -form { display: table !important;} -input { display: table-cell !important;} -.toolbarDiv {width: 100% !important;} label { - display: table-cell !important; - font-size: 1.2rem !important; + display: table-cell; + font-size: 1.2rem; } @@ -118,15 +127,24 @@ label { overflow-y: scroll; } + .valiTxt { border-bottom: 4px solid gray; padding-top: 10px; } + .picked{ border: 2px solid lime; } + +.addOnPicked{ + border: 2px solid aqua; +} + + + .pickImg { width: 50%; height: auto; @@ -141,3 +159,30 @@ canvas{ display: block; margin: 0 auto; } + + + + + +/* Responsivness */ + +@media screen and (max-width: 1400px) { + .pickImg { + width: 30%; + height: auto; + padding: 7px; + margin-left: calc(7% - 21px); + } + +} + + +@media screen and (max-width: 900px) { + .pickImg { + width: 24%; + height: auto; + padding: 3px; + margin-left: calc(1% - 10px); + } + +} diff --git a/rannak/mangud/partorg/sonaragastik/index.html b/rannak/mangud/partorg/sonaragastik/index.html index 11d31ec..be6093e 100644 --- a/rannak/mangud/partorg/sonaragastik/index.html +++ b/rannak/mangud/partorg/sonaragastik/index.html @@ -4,10 +4,10 @@ Sõnarägastik - - + + @@ -34,16 +34,11 @@ - - - - -
@@ -162,7 +156,7 @@ - + @@ -181,7 +175,7 @@ - + @@ -200,7 +194,7 @@ - + @@ -219,7 +213,7 @@ - + @@ -238,7 +232,7 @@ - + @@ -257,7 +251,7 @@ - + @@ -390,7 +384,8 @@ -
ŠT A U RI A LUU N E K S D N II I LI D SK M A
+ +
diff --git a/rannak/mangud/partorg/sonaragastik/script.js b/rannak/mangud/partorg/sonaragastik/script.js index 33626b1..2e6ffb4 100644 --- a/rannak/mangud/partorg/sonaragastik/script.js +++ b/rannak/mangud/partorg/sonaragastik/script.js @@ -40,7 +40,7 @@ function message(msg, color){ // Main stuff -const vastused = ["valuuta", "tuusik", "tsaika", "redis", "plaanimajandus", +const vastused = ["valuuta", "tsaika", "redis", "plaanimajandus", "rubla", "letialuneKaup", "talongid", "maantee", "piiritsoon", "defitsiit"]; @@ -98,7 +98,7 @@ function proovi(){ õigedCounter++; //console.log(õigedCounter); } - if (õigedCounter >= 11) + if (õigedCounter >= 10) moveOnEnable(); diff --git a/rannak/mangud/partorg/sonaragastik/style.css b/rannak/mangud/partorg/sonaragastik/style.css index 73bfa90..690ad14 100644 --- a/rannak/mangud/partorg/sonaragastik/style.css +++ b/rannak/mangud/partorg/sonaragastik/style.css @@ -3,7 +3,12 @@ } body{ - background-color: #212121 !important; + background-color: #4D5157; +} + +h1{ + color: #a1000e; + font-weight: bold; } .moveOn{ @@ -30,14 +35,14 @@ button:disabled{ .avatar { border-radius: 20px; - width: 100% !important; - max-width: 15rem !important; + width: 100%; + max-width: 15rem; } .modalHeaderWrapper{ text-align: center; - margin: 0 !important; - width: 100% !important; + margin: 0; + width: 100%; } @@ -53,17 +58,17 @@ button:disabled{ 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; + 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) !important; + background-color: rgba(0,136,169,0.8); } /* Input Box styles */ @@ -94,15 +99,15 @@ button:disabled{ /* Adding classes */ .selected { - background-color: lime !important; + background-color: #ECAC76; } .doneV{ - background-color: #562ABF; + background-color: #284F8F; } .doneH{ - background-color: #FF0883; + background-color: #C5E17A; } .done{ @@ -115,51 +120,57 @@ button:disabled{ .main{ display: flex; + justify-content: center; } .left { margin: 10px; - width: calc((100vw - (14*3rem) - 10rem)/ 2) !important; + width: 35%; font-size: .8rem; + padding: 1rem; + margin: 0; } .left strong{ font-size: 1rem; } +.tableWrapper { + width: 65%; +} + table{ - margin: 10px auto; - margin-left: 5rem; + margin: 10px ; } td { - border: 4px solid white !important; - width: 3.5rem !important; + border: 4px solid white; + width: 3.5rem; font-weight: bold; } /* td { - display: block !important; - float: left !important; - border: 2px solid white !important; - width: 5% !important; - padding-bottom: 5% !important; + display: block; + float: left; + border: 2px solid white; + width: 5%; + padding-bottom: 5%; } -td span { position: absolute !important} +td span { position: absolute} table { - display: block !important; - width: 100% !important; + display: block; + width: 100%; } tr { - display: block !important; - width: 100% !important; + display: block; + width: 100%; } tbody { - display: block !important; - width: 100% !important; + display: block; + width: 100%; } */ diff --git a/rannak/mangud/perenaine/memori/img/alko.svg b/rannak/mangud/perenaine/memori/img/alko.svg index e7bcc31..6d54db5 100644 --- a/rannak/mangud/perenaine/memori/img/alko.svg +++ b/rannak/mangud/perenaine/memori/img/alko.svg @@ -1 +1,37 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/rannak/mangud/perenaine/memori/img/alko.svg.bak b/rannak/mangud/perenaine/memori/img/alko.svg.bak new file mode 100644 index 0000000..e7bcc31 --- /dev/null +++ b/rannak/mangud/perenaine/memori/img/alko.svg.bak @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/rannak/mangud/perenaine/memori/img/riis.svg.bak b/rannak/mangud/perenaine/memori/img/riis.svg.bak deleted file mode 100644 index 8376e61..0000000 --- a/rannak/mangud/perenaine/memori/img/riis.svg.bak +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/rannak/mangud/perenaine/memori/index.html b/rannak/mangud/perenaine/memori/index.html index c8fd288..21c3583 100644 --- a/rannak/mangud/perenaine/memori/index.html +++ b/rannak/mangud/perenaine/memori/index.html @@ -4,10 +4,10 @@ Memori - - + + diff --git a/rannak/mangud/perenaine/memori/style.css b/rannak/mangud/perenaine/memori/style.css index fa7a05a..f76cfda 100644 --- a/rannak/mangud/perenaine/memori/style.css +++ b/rannak/mangud/perenaine/memori/style.css @@ -7,7 +7,16 @@ body { height: 100vh; display: flex; + background-color: #43464b; + color: white; + /* background: #eeee90 !important; + */ +} + +h1 { + color: #FEDD00; + font-weight: bold; } .moveOn{ diff --git a/rannak/mangud/perenaine/ristsona/index.html b/rannak/mangud/perenaine/ristsona/index.html index e4de94f..cb8ce41 100644 --- a/rannak/mangud/perenaine/ristsona/index.html +++ b/rannak/mangud/perenaine/ristsona/index.html @@ -4,10 +4,10 @@ Ristsõna - - + + @@ -45,13 +45,10 @@ - - -