diff --git a/_jegyzet.md b/_jegyzet.md index c14f76f..d1199d1 100644 --- a/_jegyzet.md +++ b/_jegyzet.md @@ -27,10 +27,10 @@ nagy képek, metadata ipad: nem férnek be a rublikába ha hosszúak, mi legy, e ## További kérdések -Nincs találat oldal, pl keresésnél -404 oldal Keresési találatok oldal -Esemény oldalon a "Tovább az eseményre gomb" legyen kiütött? \ No newline at end of file +Esemény oldalon a "Tovább az eseményre gomb" legyen kiütött? + +Hover a linkekre azt eseménynél? Nyílra? \ No newline at end of file diff --git a/_teendők.md b/_teendők.md index 98a29a3..29aa831 100644 --- a/_teendők.md +++ b/_teendők.md @@ -2,9 +2,7 @@ og: tag: pluginnal! -# Esemény oldal - -megcsinálni! +# Esemény oldal - ✔ # Kezdőlap @@ -28,7 +26,8 @@ scroll rossz a kiscímeknél ## mobil nézet -képek magassága és maszk +Kezdőlap: + képek magassága és maszk # Kategória oldalak @@ -39,3 +38,7 @@ vonalak néhol túlvékonyodik, vastagodik - egyenletlen # menü # Oldal + +!Nincs találat oldal, pl keresésnél + +404 oldal diff --git a/css/base.css b/css/base.css index 6319150..d4cb093 100644 --- a/css/base.css +++ b/css/base.css @@ -917,7 +917,7 @@ object { /* --------------------------- home article mobile/default -------------------------- */ /* ------------------------ home article desktop big ------------------------ */ /* ------------------------------------ - ----------------------------------- */ - /* ----------------------- articles desktop small ----------------------- */ } + /* ----------------------- home articles desktop small ----------------------- */ } @media (min-width: 769px) { .archive main section, .home main section, @@ -1705,81 +1705,159 @@ object { /* -------------------------------------------------------------------------- */ /* Events */ /* -------------------------------------------------------------------------- */ -body.category.category-esemeny header { - background-color: #000; } - -body.category.category-esemeny main { - padding-top: 9rem; } - body.category.category-esemeny main article { - height: 85vw; - max-height: calc(50vw + 180px); } - body.category.category-esemeny main article .thumbnailwrapper { - height: 50vw; } - body.category.category-esemeny main article .thumbnailwrapper img { - width: 100%; - height: 100%; } - body.category.category-esemeny main article .event-metadata { - display: flex; - flex-direction: column; - justify-content: space-between; - align-content: stretch; - padding: 2rem; - height: 35vw; - max-height: 180px; } - body.category.category-esemeny main article .event-metadata .top-row, - body.category.category-esemeny main article .event-metadata .bottom-row { +body.category.category-esemeny { + /* ---------------------------- Events on desktop --------------------------- */ } + body.category.category-esemeny header { + background-color: #000; } + body.category.category-esemeny main { + padding-top: 9rem; } + body.category.category-esemeny main article { + height: 85vw; + max-height: calc(50vw + 180px); } + body.category.category-esemeny main article .thumbnailwrapper { + height: 50vw; } + body.category.category-esemeny main article .thumbnailwrapper img { + width: 100%; + height: 100%; } + body.category.category-esemeny main article .event-metadata { display: flex; - flex-direction: row; + flex-direction: column; justify-content: space-between; - height: 50%; - flex: 0 0 auto; } - body.category.category-esemeny main article .event-metadata .top-row { - align-items: center; } - body.category.category-esemeny main article .event-metadata .top-row .ev-date { - font: 800 1.8rem "Butler"; - color: #000; - color: #00f; } - @media (min-width: 512px) { - body.category.category-esemeny main article .event-metadata .top-row .ev-date { - font-size: 2.2rem; } } - body.category.category-esemeny main article .event-metadata .top-row a { - -moz-transform: rotate(225deg); - -o-transform: rotate(225deg); - -ms-transform: rotate(225deg); - -webkit-transform: rotate(225deg); - transform: rotate(225deg); - font-size: 2.8rem; } - body.category.category-esemeny main article .event-metadata .bottom-row { - align-items: flex-end; } - body.category.category-esemeny main article .event-metadata .bottom-row h2 { - flex: 1 0.9 auto; - height: unset; - padding: 0; - font: 800 1.8rem "Butler"; - color: #000; } - @media (min-width: 512px) { - body.category.category-esemeny main article .event-metadata .bottom-row h2 { - font-size: 2.2rem; } } - body.category.category-esemeny main article .event-metadata .bottom-row .vr { + align-content: stretch; + padding: 2rem; + height: 35vw; + max-height: 180px; } + body.category.category-esemeny main article .event-metadata .top-row, + body.category.category-esemeny main article .event-metadata .bottom-row { + display: flex; + flex-direction: row; + justify-content: space-between; + height: 50%; + flex: 0 0 auto; } + body.category.category-esemeny main article .event-metadata .top-row { + align-items: center; } + body.category.category-esemeny main article .event-metadata .top-row .ev-date { + font: 800 1.8rem "Butler"; + color: #000; + color: #00f; } + @media (min-width: 512px) { + body.category.category-esemeny main article .event-metadata .top-row .ev-date { + font-size: 2.2rem; } } + @media (min-width: 769px) { + body.category.category-esemeny main article .event-metadata .top-row .ev-date { + font-size: 3rem; } } + @media (min-width: 1279px) { + body.category.category-esemeny main article .event-metadata .top-row .ev-date { + font-size: 3.2rem; } } + @media (min-width: 1919px) { + body.category.category-esemeny main article .event-metadata .top-row .ev-date { + font-size: 4.5rem; } } + body.category.category-esemeny main article .event-metadata .top-row a { + -moz-transform: rotate(225deg); + -o-transform: rotate(225deg); + -ms-transform: rotate(225deg); + -webkit-transform: rotate(225deg); + transform: rotate(225deg); + font: normal 2.8rem "Westeinde Caption"; + color: #000; } + @media (min-width: 512px) { + body.category.category-esemeny main article .event-metadata .top-row a { + font-size: 3rem; } } + @media (min-width: 769px) { + body.category.category-esemeny main article .event-metadata .top-row a { + font-size: 4rem; } } + @media (min-width: 1279px) { + body.category.category-esemeny main article .event-metadata .top-row a { + font-size: 5rem; } } + @media (min-width: 1919px) { + body.category.category-esemeny main article .event-metadata .top-row a { + font-size: 7rem; } } + body.category.category-esemeny main article .event-metadata .bottom-row { + align-items: flex-end; } + body.category.category-esemeny main article .event-metadata .bottom-row h2 { + flex: 1 0.9 auto; + height: unset; + padding: 0; + font: 800 1.8rem "Butler"; + color: #000; } + @media (min-width: 512px) { + body.category.category-esemeny main article .event-metadata .bottom-row h2 { + font-size: 2.2rem; } } + @media (min-width: 769px) { + body.category.category-esemeny main article .event-metadata .bottom-row h2 { + font-size: 3rem; } } + @media (min-width: 1279px) { + body.category.category-esemeny main article .event-metadata .bottom-row h2 { + font-size: 3.2rem; } } + @media (min-width: 1919px) { + body.category.category-esemeny main article .event-metadata .bottom-row h2 { + font-size: 4.5rem; } } + body.category.category-esemeny main article .event-metadata .bottom-row .vr { + flex: 0 0 auto; + width: 1px; + height: 100%; + background-color: #000; } + body.category.category-esemeny main article .event-metadata .bottom-row a.text-link { + flex: 1 1 auto; + font: 800 1.8rem "Butler"; + color: #000; + font: 500 1.8rem "Westeinde Caption"; + color: #00f; + text-align: right; } + @media (min-width: 512px) { + body.category.category-esemeny main article .event-metadata .bottom-row a.text-link { + font-size: 2.2rem; } } + @media (min-width: 769px) { + body.category.category-esemeny main article .event-metadata .bottom-row a.text-link { + font-size: 3rem; } } + @media (min-width: 1279px) { + body.category.category-esemeny main article .event-metadata .bottom-row a.text-link { + font-size: 3.2rem; } } + @media (min-width: 1919px) { + body.category.category-esemeny main article .event-metadata .bottom-row a.text-link { + font-size: 4.5rem; } } + body.category.category-esemeny main article .event-metadata .hr { flex: 0 0 auto; - width: 1px; - height: 100%; + height: 1px; + width: 100%; background-color: #000; } - body.category.category-esemeny main article .event-metadata .bottom-row a.text-link { - flex: 1 1 auto; - font: 800 1.8rem "Butler"; - color: #000; - font: 500 1.8rem "Westeinde Caption"; - color: #00f; - text-align: right; } - @media (min-width: 512px) { - body.category.category-esemeny main article .event-metadata .bottom-row a.text-link { - font-size: 2.2rem; } } - body.category.category-esemeny main article .event-metadata .hr { - flex: 0 0 auto; - height: 1px; - width: 100%; - background-color: #000; } + @media (min-width: 769px) { + body.category.category-esemeny main { + padding-top: 0; } + body.category.category-esemeny main section { + height: 100%; + padding-left: 10rem; + display: flex; + flex-direction: row; } + body.category.category-esemeny main section article { + width: calc(50vw - 10rem); + height: calc(50vw - 10rem); + max-width: calc(100vh - 5rem); + max-height: calc(100vh - 5rem); + min-width: 80vh; + min-height: 80vh; + margin: auto 10rem auto 0; + display: flex; + flex-direction: column; + justify-content: space-between; } + body.category.category-esemeny main section article .thumbnailwrapper { + height: unset; + flex: 0 0 auto; } + body.category.category-esemeny main section article .event-metadata { + height: unset; + max-height: 25rem; + flex: 1 1 auto; + padding: 0; } } + @media (min-width: 769px) and (min-width: 1919px) { + body.category.category-esemeny main section article .event-metadata { + max-height: 35rem; } } + @media (min-width: 769px) { + body.category.category-esemeny main section article .event-metadata .bottom-row h2 { + padding-bottom: 2rem; } + body.category.category-esemeny main section article .event-metadata .bottom-row .vr { + margin: 0 2rem; } + body.category.category-esemeny main section article .event-metadata .bottom-row .text-link { + padding-bottom: 2rem; } } /* -------------------------------------------------------------------------- */ /* single */ diff --git a/js/scripts.js b/js/scripts.js index 361380e..738cab6 100644 --- a/js/scripts.js +++ b/js/scripts.js @@ -331,6 +331,10 @@ /** * scroll to next or previous section + * Ex: + * currElem = homeScroll(currElem, "prev") + * currElem = homeScroll(currElem, "next") + * * @param {jQuery} target put here currElem * @param {String} direction "next" of "prev" */ @@ -353,19 +357,26 @@ if (nextelem.attr("class") == "misha_loadmore") { loadmore() return target + } else if (isEsemeny) { + offset = offset - (desktophomemargin) } else { //from the third wrap modify the offset - var wNum = parseInt($(nextelem).attr("class").split(" ")[1].split("-")[2]) + var wNum = parseInt($(nextelem).attr("class").split(" ")[1].split("-")[1]) + console.log(wNum) if (wNum == 3 || !isHome) { - offset = offset - (desktophomemargin / 2) + offset = offset - (desktophomemargin /2 ) } else if (wNum > 4 || !isHome) { offset = offset - desktophomemargin } } console.log("scrolling to: " + nextelem.attr("class") + " - offset: " + offset) - $('html, body, .wrapper').stop().animate({ scrollLeft: offset }, 800, function () { + + const scrollspeed = isEsemeny ? 500 : 800 + + + $('html, body, .wrapper').stop().animate({ scrollLeft: offset }, scrollspeed, function () { //hide the left arrow if on start - if (nextelem.hasClass("home_wrapper-1")) { + if (nextelem.is(selector + ':first-child')) { $(".header-scroll-left").hide() } else { $(".header-scroll-left").show() @@ -393,13 +404,13 @@ } } - const selector = 'main>#content>div' + const selector = isEsemeny ? 'main>section>article' : 'main>#content>div' var currElem = $(selector + ':first-child') //checking the current scroll location for refresh: if (!isMobile) { - if (isMasonryPage) { + if (isMasonryPage || isEsemeny) { const homeDivWidths = [] const homeFullWidths = [] homeDivWidths[0] = 0 @@ -426,7 +437,8 @@ currElem = $(selector + ':nth-child(' + scrollnr + ')') - if (currElem.hasClass("home_wrapper-1")) { + + if (scrollnr == 1) { $(".header-scroll-left").hide() } @@ -443,7 +455,7 @@ $(window).on('wheel DOMMouseScroll', function (e) { //e.preventDefault(); if (!isMobile) { - if (isMasonryPage) { + if (isMasonryPage || isEsemeny) { if (scrolltimer) { return false; } @@ -718,12 +730,9 @@ /* -------------------------------------------------------------------------- */ if (isEsemeny) { - - //add spaces to date - // $(".event-metadata .ev-date").each(function () { - // let repl = $(this).html().replace(/\.\b/g, ". ") - // $(this).html(repl) - // }) + if (!isMobile) { + $('html').css({ overflowY: "hidden" }) + } } @@ -805,10 +814,10 @@ // .removeClass("vis") // }) - $('.wp-block-gallery .blocks-gallery-item, .wp-block-image').hover(function(){ + $('.wp-block-gallery .blocks-gallery-item, .wp-block-image').hover(function () { $(this).find("figcaption").addClass("vis") - - },function(){ + + }, function () { $('.wp-block-gallery .vis, .wp-block-image .vis').removeClass("vis") }) diff --git a/loop-inner.php b/loop-inner.php index 3ff248d..9ad39db 100644 --- a/loop-inner.php +++ b/loop-inner.php @@ -1,7 +1,5 @@ diff --git a/sass/_font-mixins.scss b/sass/_font-mixins.scss index 71170ef..e5348cd 100644 --- a/sass/_font-mixins.scss +++ b/sass/_font-mixins.scss @@ -192,22 +192,49 @@ line-height: 1.3; } -@mixin event-title{ +@mixin event-title { font: 800 1.8rem "Butler"; color: #000; @media #{$tablet} { font-size: 2.2rem; } + @media #{$smalldesktop} { + font-size: 3rem; + } + + @media #{$bigdesktop} { + font-size: 3.2rem; + } + @media #{$verybigdesktop} { + font-size: 4.5rem; + } } -@mixin event-date{ +@mixin event-date { @include event-title(); color: #00f; } -@mixin event-link{ +@mixin event-link { @include event-title(); font: 500 1.8rem "Westeinde Caption"; color: #00f; } +@mixin event-arrow { + font: normal 2.8rem "Westeinde Caption"; + color: #000; + @media #{$tablet} { + font-size: 3rem; + } + @media #{$smalldesktop} { + font-size: 4rem; + } + + @media #{$bigdesktop} { + font-size: 5rem; + } + @media #{$verybigdesktop} { + font-size: 7rem; + } +} diff --git a/sass/base.scss b/sass/base.scss index e224057..13cee43 100644 --- a/sass/base.scss +++ b/sass/base.scss @@ -1078,7 +1078,7 @@ $v-unit-6: 24rem; } } //smalldesktop end - /* ----------------------- articles desktop small ----------------------- */ + /* ----------------------- home articles desktop small ----------------------- */ @media #{$smalldesktop} { .home_wrapper-small { @@ -1317,7 +1317,7 @@ body.category.category-esemeny { } a { @include transform(rotate(225deg)); - font-size: 2.8rem; + @include event-arrow(); } } @@ -1352,13 +1352,79 @@ body.category.category-esemeny { } } } -} + + /* ---------------------------- Events on desktop --------------------------- */ + @media #{$smalldesktop} { + main { + padding-top: 0; + section { + height: 100%; + // padding-top: + + padding-left: $h-unit-2; + display: flex; + flex-direction: row; + article { + width: calc(50vw - #{$h-unit-2}); + height: calc(50vw - #{$h-unit-2}); + max-width: calc(100vh - #{$h-unit-1}); + max-height: calc(100vh - #{$h-unit-1}); + + min-width: 80vh; + min-height: 80vh; + // margin: auto; + margin: auto $h-unit-2 auto 0; + + display: flex; + flex-direction: column; + justify-content: space-between; + + .thumbnailwrapper { + height: unset; + flex: 0 0 auto; + } + .event-metadata { + height: unset; + max-height: $h-unit-5; + @media #{$verybigdesktop} { + max-height: $h-unit-5 + $h-unit-2 + } + flex: 1 1 auto; + padding: 0; + // .top-row{ + // .ev-date{ + // padding-left: 2rem; + // } + + // padding-right: 2rem; + + // } + .bottom-row{ + h2{ + // padding-left: 2rem; + padding-bottom: 2rem; + } + .vr{ + margin: 0 2rem; + } + .text-link{ + // padding-right: 2rem; + padding-bottom: 2rem; + } + + } + } + } + } + } + } +} //body.category.category-esemeny end /* -------------------------------------------------------------------------- */ /* single */ /* -------------------------------------------------------------------------- */ -@mixin singlDesktopLayout() { +@mixin singleDesktopLayout() { padding-right: $h-unit-4; padding-left: 0; max-width: calc(1024px + #{$h-unit-4}); @@ -1511,7 +1577,7 @@ body.category.category-esemeny { @include triangle-corner-bordered(#{$h-unit-1}, #{$h-unit-1} + 1px, white, #000, left); .metaWrapper { - @include singlDesktopLayout(); + @include singleDesktopLayout(); } // .time-cat { @@ -1522,7 +1588,7 @@ body.category.category-esemeny { min-height: unset; top: -#{$h-unit-1}; position: relative; - @include singlDesktopLayout(); + @include singleDesktopLayout(); } } } @@ -1569,7 +1635,7 @@ body.category.category-esemeny { padding: $padd; @media #{$smalldesktop} { top: -#{$h-unit-1}; - @include singlDesktopLayout(); + @include singleDesktopLayout(); } h2 { @@ -1849,7 +1915,7 @@ body.category.category-esemeny { padding-top: $padd * 2; top: -#{$h-unit-1}; margin: 0; - @include singlDesktopLayout(); + @include singleDesktopLayout(); a { margin-bottom: $padd * 2; @@ -1929,7 +1995,7 @@ body.category.category-esemeny { top: -#{$h-unit-1}; position: relative; padding-top: $padd * 2; - @include singlDesktopLayout(); + @include singleDesktopLayout(); & > h3 { display: block;