From 4f549e5e446b2361c1b216bc6d00c4a0cf8dc3e7 Mon Sep 17 00:00:00 2001 From: siinus Date: Tue, 20 Aug 2024 18:26:48 +0300 Subject: [PATCH 1/4] Charset to UTF-8 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d1442f7..64c83e0 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # remondikohvik.github.io -slaidide �leminek t��tab. Lisada v�rvide �leminekut scrollimisel. vajutamise v�rvid muutuvad. +slaidide üleminek töötab. Lisada värvide üleminekut scrollimisel. vajutamise värvid muutuvad. -K�ik slaidid on lisatud. +Kõik slaidid on lisatud. leht 0 on valmis. From 938f4d3b28ae2b6b63e150083ce49eb0391feb6c Mon Sep 17 00:00:00 2001 From: siinus Date: Tue, 20 Aug 2024 18:54:08 +0300 Subject: [PATCH 2/4] Ignore useless data --- .gitignore | 1 + .vs/VSWorkspaceState.json | 7 ------ .vs/remondikohvik.github.io/v17/.wsuo | Bin 12288 -> 0 bytes .../v17/DocumentLayout.json | 23 ------------------ .vs/slnx.sqlite | Bin 90112 -> 0 bytes 5 files changed, 1 insertion(+), 30 deletions(-) create mode 100644 .gitignore delete mode 100644 .vs/VSWorkspaceState.json delete mode 100644 .vs/remondikohvik.github.io/v17/.wsuo delete mode 100644 .vs/remondikohvik.github.io/v17/DocumentLayout.json delete mode 100644 .vs/slnx.sqlite diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..88dbff1 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.vs/ diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json deleted file mode 100644 index 23634a9..0000000 --- a/.vs/VSWorkspaceState.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "ExpandedNodes": [ - "" - ], - "SelectedNode": "\\C:\\Users\\reisel\\Source\\Repos\\remondikohvik.github.io", - "PreviewInSolutionExplorer": false -} \ No newline at end of file diff --git a/.vs/remondikohvik.github.io/v17/.wsuo b/.vs/remondikohvik.github.io/v17/.wsuo deleted file mode 100644 index 32cb672ef30ff27b6d3ee74f0b0eaba994be1abb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeHNO>7%Q6n<_gkn&U7LZG2Qgd*qxr?z7!PEf0~=?@@6LYyZ2goFQ*IB{ajc4#X^ z74^WG6A~OMapQ)N5cGnCka{j>PUTRJaN)v%hVPr*i6`r|yTO$^X(vnJhKs%uI_bAHD zbD60B)N!r<-N@^H=JP4L{ve)u9P@oAzxz1Ab#lA7?#_Cyzgb5eGRt~jFzd|xakPKV z=(GE{@&B7q0v=CZ`5-yuR%J}x=izxQpthuZAnOel&LzD9|HJebT$q_BUJ0) ze{Hda)i?EX)Cv9e957Sh^a6hLJ7*Qg)3S(CSvP9%?Dc{FIL4!{GM&YG7vPPq0Jnsv zSHIWlEpiVNLoo{Gak_Y<++pg$}2wi zDeh@Z^!q7sCCFS7vTy+cnR8tB}qs0&3y6QF+q`mU6zR_NFG320v$ znnvnA#Ml{S3;JvHp&u5i0LnAU609j*C9R;pW&8gO`f2;q3O@I#3M@8vs zE+!|wg-I>6B9UjX_C=+cj1OA1R!{2=`B(Jov$y%KUY>C~t^d>m+GD?|-TsurcJL`j z>|Y(DIEtd@)b9K}12t%<&mv}%cIwP=wmTm%IPV8b%b}mX?89}Zg&30&nS&==hW?gt zpTj*1jbS;Dl4;N8)DBmKhUs?Hcv`(2PCx}%U3vn`(hpCFI=2W*m_mtO_#8ovL|uMg zJ}_!p%U0#KwSKxa&%Kr{HzoNJYB}<2Asn>LUvRV3IA``@e%liFjdAeT^6V1eHocJw zYKpd3wuBa^@NJR1=BqXH;5mjipf5cTn~#OFv0yqi7z;*I(PS_+6pshv1L0UC8%f7Q z$(Uk_I<9h@+$hUuPbQ{E!jbq$Xyl`zSU4Wfga(4c@!?1?n#@Lm$<%x}7zqu9BZHCX zP&ym?n0)43tn|)pu7Lm4S91a{OD|#(WO^7f$9tpHuKaK>bi1}A{zsfn+Fcyz#D6;R zpPh{VG_q}8-rVZZG3I&mW!hU(4se&9gt{z>8e%rt_b3{TW?iL}(fQR{RrjQDSW{%5+uj3Ee22|hF&yjY{m&py^`T~~0EHdi*M5Foe{7;YcC@!!3=eHV-?~MEV`2N?j z{CB?pRqcdx{qOhpKZt@#cV777)aTi6-_vEU&y{3ub?)vP*ZuaV>@t2#j`+dvIg<{w zgYT8j|7ts@{Owiyum6MKWt}?qziR(Azx?X&PV4{mK(okS8GelZl3_&!{YL(lRJ^bZ z|A61a=pppuzbj?=bN$H4--dsB`KxzRnNJt59XtP7W#iBve|7z^9=-Ve{H@=~W9=X4 Lr{?=k+pm8Bd!>*X diff --git a/.vs/remondikohvik.github.io/v17/DocumentLayout.json b/.vs/remondikohvik.github.io/v17/DocumentLayout.json deleted file mode 100644 index ed9c666..0000000 --- a/.vs/remondikohvik.github.io/v17/DocumentLayout.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "Version": 1, - "WorkspaceRootPath": "C:\\Users\\reisel\\source\\repos\\remondikohvik.github.io\\", - "Documents": [], - "DocumentGroupContainers": [ - { - "Orientation": 0, - "VerticalTabListWidth": 256, - "DocumentGroups": [ - { - "DockedWidth": 200, - "SelectedChildIndex": -1, - "Children": [ - { - "$type": "Bookmark", - "Name": "ST:128:0:{75188d03-9892-4ae2-abf1-207126247ce5}" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite deleted file mode 100644 index d78d5a428ee65b52d9a0bdd1469a6d24d6ae52d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90112 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 M01yBIPm{p^0GmAq3IG5A From b910f7ab22ad2a5dd99a2c67a6924178a9dd8cdc Mon Sep 17 00:00:00 2001 From: siinus Date: Tue, 20 Aug 2024 18:58:01 +0300 Subject: [PATCH 3/4] Tidy up some formatting and semantics --- js/script.js | 63 +++++----- main.html | 155 +++++++++++------------- style/style.css | 312 +++++++++++++++++++++++++----------------------- 3 files changed, 266 insertions(+), 264 deletions(-) diff --git a/js/script.js b/js/script.js index 8a6610a..207b72d 100644 --- a/js/script.js +++ b/js/script.js @@ -1,32 +1,31 @@ -document.querySelectorAll('a[href^="#"]').forEach(anchor => { - anchor.addEventListener('click', function (e) { - e.preventDefault(); - - // Remove the class from all anchors - document.querySelectorAll('a[href^="#"]').forEach(a => a.classList.remove('highlight')); - - // Add the class to the clicked anchor - this.classList.add('highlight'); - - document.querySelector(this.getAttribute('href')).scrollIntoView({ - behavior: 'smooth' - }); - }); -}); - - -//new size new div under 600 px for calender and maps - -window.addEventListener('resize', function () { - if (window.innerWidth <= 600) { - const originalDiv = document.getElementsByClassName('cal_maps'); - const newDiv = document.getElementById('newDiv_calender_maps'); - if (originalDiv && newDiv) { - newDiv.innerHTML = originalDiv.innerHTML; - originalDiv.innerHTML = ''; - } - } -}); - -// Trigger the resize event on page load -window.dispatchEvent(new Event('resize')); +document.querySelectorAll('a[href^="#"]').forEach(anchor => { + anchor.addEventListener('click', function (e) { + e.preventDefault(); + + // Remove the class from all anchors + document.querySelectorAll('a[href^="#"]').forEach(a => a.classList.remove('highlight')); + + // Add the class to the clicked anchor + this.classList.add('highlight'); + + document.querySelector(this.getAttribute('href')).scrollIntoView({ + behavior: 'smooth' + }); + }); +}); + +// New size new div under 600 px for calendar and maps + +window.addEventListener('resize', function () { + if (window.innerWidth <= 600) { + const originalDiv = document.getElementsByClassName('cal_maps'); + const newDiv = document.getElementById('newDiv_calender_maps'); + if (originalDiv && newDiv) { + newDiv.innerHTML = originalDiv.innerHTML; + originalDiv.innerHTML = ''; + } + } +}); + +// Trigger the resize event on page load +window.dispatchEvent(new Event('resize')); diff --git a/main.html b/main.html index 8a47ab2..eb6ef84 100644 --- a/main.html +++ b/main.html @@ -1,83 +1,72 @@ - - - - Remondikohvik - - - -
-
- - - - - -
- - -
- - -
- - -
- -
-
-
- -
-

REMONDIKOHVIK

-
- -
- -

26.OKTOOBER 2024

-
- - -
- -

TALTECH CAFFEINE

-
-
-
-
-
- - -
-
- -
- -
-
- -
- -
-
- -
- - -
-
- -
-
- - - - - - - - - - - - - + + + + Remondikohvik + + + + + + + + diff --git a/style/style.css b/style/style.css index 08582cc..f2a64f2 100644 --- a/style/style.css +++ b/style/style.css @@ -1,149 +1,163 @@ -body { - background-color: #28242C; - margin: 0; - padding: 0; - box-sizing: border-box; - scroll-behavior: smooth; - font-family: 'Radley';font-size: 22px; -} - -*::-webkit-scrollbar { - width: 0; -} - -.bullets { - position: fixed; - height: 100px; - display: flex; - left: 1vh; - transform: scale(1.5); - flex-direction: column; - justify-content: space-evenly; - top: 50vh; - z-index: 9999; -} -.bullets a { - transition: color 0.3s; -} -.bullet { - width: 10px; - height: 10px; - border-style: solid; - border-color: white; - border-radius: 50%; - margin: 0 5px; - cursor: pointer; -} - -.highlight { - border-color: #FFA50C; - background: linear-gradient(to bottom, #8819199e 0%, #ffa50c 100%); -} -#carusel { - display: flex; - flex-direction: column; - width: 100%; - height: 100%; -} -.Leht_0 { - display: flex; - height: 100vh; -} -.Lehed { - position: absolute; - width: 34%; - height: auto; - -} -#R01{ - right: 0; - top: 0; -} - -.section{ - width: 100%; - height: 100vh; - margin: 0; - padding: 0; - box-sizing: border-box; - transition: transform 0.5s ease; -} -#info { - display: flex; - flex-direction: column; - align-items: center; - text-align-last: center; - position: relative; - top: 4em; -} -#rk_logo { - width: 30%; - height: auto; -} - -#RK_txt { - font-weight: normal; - color: #FFA50C; - font-size: 9vh; -} - -.cal_maps_icons { - height: 15vh; - width: auto; -} -#cal_maps, .CMinfo { - display: flex; - align-items: center; - color: #b88d61; - justify-content: center; - font-size: large; -} - -@media screen and (max-width: 400px) { - #RK_txt { - font-size: 5vh; - } -} -@media screen and (min-width: 400px) { - #RK_txt { - font-size: 7vh; - } -} -@media screen and (max-width: 600px) { - #info { - position: relative; - top: 6em; - } - - #rk_logo { - width: 50%; - } - .bullets { - transform: scale(1); - } - - .Lehed { - width: 45%; - } -} - -@media screen and (max-width: 800px) { - #cal_maps { - flex-direction: column; - } - - .CMinfo { - flex-direction: column; - } - - -} - -@media screen and (min-width: 1090px) { - .Lehed { - width: 25%; - } - #rk_logo { - width: 25%; - } -} \ No newline at end of file +body { + background-color: #28242C; + margin: 0; + padding: 0; + box-sizing: border-box; + scroll-behavior: smooth; + font-family: 'Radley', serif; + font-size: 22px; +} + +*::-webkit-scrollbar { + width: 0; +} + +.bullets { + position: fixed; + height: 100px; + display: flex; + left: 1vh; + transform: scale(1.5); + flex-direction: column; + justify-content: space-evenly; + top: 50vh; + z-index: 9999; +} + +.bullets a { + transition: color 0.3s; +} + +.bullet { + width: 10px; + height: 10px; + border-style: solid; + border-color: white; + border-radius: 50%; + margin: 0 5px; + cursor: pointer; +} + +.highlight { + border-color: #FFA50C; + background: linear-gradient(to bottom, #8819199e 0%, #ffa50c 100%); +} + +#carousel { + display: flex; + flex-direction: column; + width: 100%; + height: 100%; +} + +.page_0 { + display: flex; + height: 100vh; +} + +.pages { + position: absolute; + width: 34%; + height: auto; + +} + +#r01 { + right: 0; + top: 0; +} + +.section { + width: 100%; + height: 100vh; + margin: 0; + padding: 0; + box-sizing: border-box; + transition: transform 0.5s ease; +} + +#info { + display: flex; + flex-direction: column; + align-items: center; + text-align-last: center; + position: relative; + top: 4em; +} + +#rk_logo { + width: 30%; + height: auto; +} + +#rk_txt { + font-weight: normal; + color: #FFA50C; + font-size: 9vh; +} + +.cal_maps_icons { + height: 15vh; + width: auto; +} + +#cal_maps, .cmInfo { + display: flex; + align-items: center; + color: #b88d61; + justify-content: center; + font-size: large; +} + +@media screen and (max-width: 400px) { + #rk_txt { + font-size: 5vh; + } +} + +@media screen and (min-width: 400px) { + #rk_txt { + font-size: 7vh; + } +} + +@media screen and (max-width: 600px) { + #info { + position: relative; + top: 6em; + } + + #rk_logo { + width: 50%; + } + + .bullets { + transform: scale(1); + } + + .pages { + width: 45%; + } +} + +@media screen and (max-width: 800px) { + #cal_maps { + flex-direction: column; + } + + .cmInfo { + flex-direction: column; + } + + +} + +@media screen and (min-width: 1090px) { + .pages { + width: 25%; + } + + #rk_logo { + width: 25%; + } +} From 30dbdc5e18d999de4da08b48fecd05872d5ea6ba Mon Sep 17 00:00:00 2001 From: siinus Date: Tue, 20 Aug 2024 19:16:53 +0300 Subject: [PATCH 4/4] main.html is not a thing --- main.html => index.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename main.html => index.html (100%) diff --git a/main.html b/index.html similarity index 100% rename from main.html rename to index.html