diff --git a/_jegyzet.md b/_jegyzet.md index d1199d1..ef093b8 100644 --- a/_jegyzet.md +++ b/_jegyzet.md @@ -27,7 +27,8 @@ nagy képek, metadata ipad: nem férnek be a rublikába ha hosszúak, mi legy, e ## További kérdések - +Kiscímek + .vr: néha nagyobb, élsimítás dolgok -> ezt nem tudom előidézni, szerintem megoldottam, de ha megint látszik, akkor küldjetek printscreent! Keresési találatok oldal diff --git a/_teendők.md b/_teendők.md index 29aa831..d5e7e0e 100644 --- a/_teendők.md +++ b/_teendők.md @@ -9,11 +9,6 @@ og: tag: pluginnal! felgördülő szövegkivonat -> felülre igazítva felgördülő alcím -> pozíciója a kép alsó éléhez igazodik -alapből lehet hogy több látszódjon - -Kiscímek - .vr: néha nagyobb, élsimítás dolgok - Nyitócikkek felgördülő lead hosszát pontosítani Nagycímes címek, még feljebb @@ -22,7 +17,6 @@ semmiképpen ne lógjon a cím elé a felgördölő cucc Max karakterszám alcímnél, hogy hova menjen -scroll rossz a kiscímeknél ## mobil nézet diff --git a/css/base.css b/css/base.css index d4cb093..02e036e 100644 --- a/css/base.css +++ b/css/base.css @@ -789,6 +789,12 @@ object { @media (min-width: 769px) { .wrapper main section article .metadata { font-size: 1.2rem; } } + @media (min-width: 1279px) { + .wrapper main section article .metadata { + font-size: 1.3rem; } } + @media (min-width: 1919px) { + .wrapper main section article .metadata { + font-size: 2.5rem; } } @media (max-width: 768px) { .wrapper main section article .metadata::after { content: ""; @@ -1002,7 +1008,8 @@ object { background-color: #000; flex-grow: 0 !important; flex-shrink: 0 !important; - flex-basis: auto !important; } + flex-basis: auto !important; + box-shadow: 0 0 1px transparent; } .archive main section article .metadata .bevezeto, .archive main section article .metadata .alcim, .archive main section article .metadata .curvyArrow, @@ -1018,7 +1025,8 @@ object { .home main section .home_wrapper-big, .search-results main section .home_wrapper-big { flex: 0 0 auto; - border-right: #000 1px solid; } + border-right: #000 1px solid; + /* ------------------------ home article desktop 1 + 2 ----------------------- */ } .archive main section .home_wrapper-big article, .home main section .home_wrapper-big article, .search-results main section .home_wrapper-big article { @@ -1032,7 +1040,7 @@ object { border-top: 1px #000 solid; /* ------------- home article desktop big - thumbnail and title ------------- */ /* -------------------------- home article metadata big------------------------- */ - /* ------------------------- home article big hover ------------------------- */ } + /* --------------------- home article desktop big hover --------------------- */ } .archive main section .home_wrapper-big article .thumbnailwrapper, .home main section .home_wrapper-big article .thumbnailwrapper, .search-results main section .home_wrapper-big article .thumbnailwrapper { @@ -1175,11 +1183,11 @@ object { display: block; top: 0; border: none; - width: calc(100% - 4rem); + width: calc(100% - 4rem + (1px)); border-top: #000 1px solid; background-color: transparent; left: calc(4rem); - margin-left: calc((0) * -1); } + margin-left: calc((1px) * -1); } .archive main section .home_wrapper-big.home_wrapper-1 article .metadata::before, .home main section .home_wrapper-big.home_wrapper-1 article .metadata::before, .search-results main section .home_wrapper-big.home_wrapper-1 article .metadata::before { @@ -1191,7 +1199,7 @@ object { top: 0; background-color: transparent; z-index: 9; - left: calc((0) * -1); + left: calc((1px) * -1); border-left: #000 solid 1px; -moz-transform: skewX(-45deg); -o-transform: skewX(-45deg); @@ -1224,11 +1232,11 @@ object { display: block; top: 0; border: none; - width: calc(100% - 4rem); + width: calc(100% - 4rem + (1px)); border-top: #000 1px solid; background-color: transparent; right: calc(4rem); - margin-right: calc((0) * -1); } + margin-right: calc((1px) * -1); } .archive main section .home_wrapper-big.home_wrapper-2 article .metadata::before, .home main section .home_wrapper-big.home_wrapper-2 article .metadata::before, .search-results main section .home_wrapper-big.home_wrapper-2 article .metadata::before { @@ -1240,7 +1248,7 @@ object { top: 0; background-color: transparent; z-index: 9; - right: calc((0) * -1); + right: calc((1px) * -1); border-right: #000 solid 1px; -moz-transform: skewX(45deg); -o-transform: skewX(45deg); @@ -1282,6 +1290,10 @@ object { .home main section .home_wrapper-small.home_wrapper-s1.home_wrapper-small.home_wrapper-1, .search-results main section .home_wrapper-small.home_wrapper-s1.home_wrapper-small.home_wrapper-1 { margin-left: 10rem; } + .archive main section .home_wrapper-small:last-child, + .home main section .home_wrapper-small:last-child, + .search-results main section .home_wrapper-small:last-child { + margin-right: 10rem; } .archive main section .home_wrapper-small article, .archive main section .home_wrapper-small .archivetitle, .archive main section .home_wrapper-small .archivedescription, @@ -1357,7 +1369,7 @@ object { border-top: #000 1px solid; background-color: transparent; left: calc(5rem); - margin-left: calc((0) * -1); } + margin-left: 0; } .archive main section .home_wrapper-small article .metadata::before, .archive main section .home_wrapper-small .archivetitle .metadata::before, .archive main section .home_wrapper-small .archivedescription .metadata::before, @@ -1375,7 +1387,7 @@ object { top: 0; background-color: transparent; z-index: 9; - left: calc((0) * -1); + left: 0; border-left: #000 solid 1px; -moz-transform: skewX(-45deg); -o-transform: skewX(-45deg); @@ -1383,7 +1395,64 @@ object { -webkit-transform: skewX(-45deg); transform: skewX(-45deg); transform-origin: left bottom; - border-top: #000 solid 1px; } + border-top: #000 solid 1px; } } + @media (min-width: 769px) and (min-width: 1919px) { + .archive main section .home_wrapper-small article .metadata, + .archive main section .home_wrapper-small .archivetitle .metadata, + .archive main section .home_wrapper-small .archivedescription .metadata, + .home main section .home_wrapper-small article .metadata, + .home main section .home_wrapper-small .archivetitle .metadata, + .home main section .home_wrapper-small .archivedescription .metadata, + .search-results main section .home_wrapper-small article .metadata, + .search-results main section .home_wrapper-small .archivetitle .metadata, + .search-results main section .home_wrapper-small .archivedescription .metadata { + height: 10rem; } + .archive main section .home_wrapper-small article .metadata::after, + .archive main section .home_wrapper-small .archivetitle .metadata::after, + .archive main section .home_wrapper-small .archivedescription .metadata::after, + .home main section .home_wrapper-small article .metadata::after, + .home main section .home_wrapper-small .archivetitle .metadata::after, + .home main section .home_wrapper-small .archivedescription .metadata::after, + .search-results main section .home_wrapper-small article .metadata::after, + .search-results main section .home_wrapper-small .archivetitle .metadata::after, + .search-results main section .home_wrapper-small .archivedescription .metadata::after { + position: absolute; + content: ""; + display: block; + top: 0; + border: none; + width: calc(100% - 10rem); + border-top: #000 1px solid; + background-color: transparent; + left: calc(10rem); + margin-left: 0; } + .archive main section .home_wrapper-small article .metadata::before, + .archive main section .home_wrapper-small .archivetitle .metadata::before, + .archive main section .home_wrapper-small .archivedescription .metadata::before, + .home main section .home_wrapper-small article .metadata::before, + .home main section .home_wrapper-small .archivetitle .metadata::before, + .home main section .home_wrapper-small .archivedescription .metadata::before, + .search-results main section .home_wrapper-small article .metadata::before, + .search-results main section .home_wrapper-small .archivetitle .metadata::before, + .search-results main section .home_wrapper-small .archivedescription .metadata::before { + display: block; + content: ""; + position: absolute; + width: calc(10rem); + height: calc(10rem); + top: 0; + background-color: transparent; + z-index: 9; + left: 0; + border-left: #000 solid 1px; + -moz-transform: skewX(-45deg); + -o-transform: skewX(-45deg); + -ms-transform: skewX(-45deg); + -webkit-transform: skewX(-45deg); + transform: skewX(-45deg); + transform-origin: left bottom; + border-top: #000 solid 1px; } } + @media (min-width: 769px) { .archive main section .home_wrapper-small article .metadata.vis, .archive main section .home_wrapper-small .archivetitle .metadata.vis, .archive main section .home_wrapper-small .archivedescription .metadata.vis, @@ -1413,7 +1482,14 @@ object { .search-results main section .home_wrapper-small .archivedescription .metadata .categories, .search-results main section .home_wrapper-small .archivedescription .metadata .postedon { font: bold 1rem "Westeinde Caption"; - color: #000; } } + color: #000; + display: flex; + flex-direction: row; + align-content: center; + margin-top: auto; + margin-bottom: auto; + flex-wrap: nowrap; + justify-content: center; } } @media (min-width: 769px) and (min-width: 769px) { .archive main section .home_wrapper-small article .metadata .categories, .archive main section .home_wrapper-small article .metadata .postedon, @@ -1434,6 +1510,46 @@ object { .search-results main section .home_wrapper-small .archivedescription .metadata .categories, .search-results main section .home_wrapper-small .archivedescription .metadata .postedon { font-size: 1.2rem; } } + @media (min-width: 769px) and (min-width: 1279px) { + .archive main section .home_wrapper-small article .metadata .categories, + .archive main section .home_wrapper-small article .metadata .postedon, + .archive main section .home_wrapper-small .archivetitle .metadata .categories, + .archive main section .home_wrapper-small .archivetitle .metadata .postedon, + .archive main section .home_wrapper-small .archivedescription .metadata .categories, + .archive main section .home_wrapper-small .archivedescription .metadata .postedon, + .home main section .home_wrapper-small article .metadata .categories, + .home main section .home_wrapper-small article .metadata .postedon, + .home main section .home_wrapper-small .archivetitle .metadata .categories, + .home main section .home_wrapper-small .archivetitle .metadata .postedon, + .home main section .home_wrapper-small .archivedescription .metadata .categories, + .home main section .home_wrapper-small .archivedescription .metadata .postedon, + .search-results main section .home_wrapper-small article .metadata .categories, + .search-results main section .home_wrapper-small article .metadata .postedon, + .search-results main section .home_wrapper-small .archivetitle .metadata .categories, + .search-results main section .home_wrapper-small .archivetitle .metadata .postedon, + .search-results main section .home_wrapper-small .archivedescription .metadata .categories, + .search-results main section .home_wrapper-small .archivedescription .metadata .postedon { + font-size: 1.3rem; } } + @media (min-width: 769px) and (min-width: 1919px) { + .archive main section .home_wrapper-small article .metadata .categories, + .archive main section .home_wrapper-small article .metadata .postedon, + .archive main section .home_wrapper-small .archivetitle .metadata .categories, + .archive main section .home_wrapper-small .archivetitle .metadata .postedon, + .archive main section .home_wrapper-small .archivedescription .metadata .categories, + .archive main section .home_wrapper-small .archivedescription .metadata .postedon, + .home main section .home_wrapper-small article .metadata .categories, + .home main section .home_wrapper-small article .metadata .postedon, + .home main section .home_wrapper-small .archivetitle .metadata .categories, + .home main section .home_wrapper-small .archivetitle .metadata .postedon, + .home main section .home_wrapper-small .archivedescription .metadata .categories, + .home main section .home_wrapper-small .archivedescription .metadata .postedon, + .search-results main section .home_wrapper-small article .metadata .categories, + .search-results main section .home_wrapper-small article .metadata .postedon, + .search-results main section .home_wrapper-small .archivetitle .metadata .categories, + .search-results main section .home_wrapper-small .archivetitle .metadata .postedon, + .search-results main section .home_wrapper-small .archivedescription .metadata .categories, + .search-results main section .home_wrapper-small .archivedescription .metadata .postedon { + font-size: 2.5rem; } } @media (min-width: 769px) { .archive main section .home_wrapper-small article .metadata .categories, .archive main section .home_wrapper-small .archivetitle .metadata .categories, @@ -1444,9 +1560,21 @@ object { .search-results main section .home_wrapper-small article .metadata .categories, .search-results main section .home_wrapper-small .archivetitle .metadata .categories, .search-results main section .home_wrapper-small .archivedescription .metadata .categories { - margin-left: 6rem; - padding: 1.33333rem 0; - flex: 1 1 auto; } + margin-left: 5rem; + padding-right: 1rem; + flex: 1 0 auto; } } + @media (min-width: 769px) and (min-width: 1919px) { + .archive main section .home_wrapper-small article .metadata .categories, + .archive main section .home_wrapper-small .archivetitle .metadata .categories, + .archive main section .home_wrapper-small .archivedescription .metadata .categories, + .home main section .home_wrapper-small article .metadata .categories, + .home main section .home_wrapper-small .archivetitle .metadata .categories, + .home main section .home_wrapper-small .archivedescription .metadata .categories, + .search-results main section .home_wrapper-small article .metadata .categories, + .search-results main section .home_wrapper-small .archivetitle .metadata .categories, + .search-results main section .home_wrapper-small .archivedescription .metadata .categories { + margin-left: 10rem; } } + @media (min-width: 769px) { .archive main section .home_wrapper-small article .metadata .postedon, .archive main section .home_wrapper-small .archivetitle .metadata .postedon, .archive main section .home_wrapper-small .archivedescription .metadata .postedon, @@ -1456,7 +1584,7 @@ object { .search-results main section .home_wrapper-small article .metadata .postedon, .search-results main section .home_wrapper-small .archivetitle .metadata .postedon, .search-results main section .home_wrapper-small .archivedescription .metadata .postedon { - padding: 1.33333rem 1rem; + padding: 0 1rem; flex: 1 0 auto; } } @media (min-width: 769px) and (min-width: 769px) { .archive main section .home_wrapper-small article h2, @@ -1498,7 +1626,27 @@ object { .search-results main section .home_wrapper-small .archivetitle h2 a, .search-results main section .home_wrapper-small .archivedescription h2, .search-results main section .home_wrapper-small .archivedescription h2 a { - font-size: 2.2rem; } } + font-size: 2rem; } } + @media (min-width: 769px) and (min-width: 1919px) { + .archive main section .home_wrapper-small article h2, + .archive main section .home_wrapper-small article h2 a, + .archive main section .home_wrapper-small .archivetitle h2, + .archive main section .home_wrapper-small .archivetitle h2 a, + .archive main section .home_wrapper-small .archivedescription h2, + .archive main section .home_wrapper-small .archivedescription h2 a, + .home main section .home_wrapper-small article h2, + .home main section .home_wrapper-small article h2 a, + .home main section .home_wrapper-small .archivetitle h2, + .home main section .home_wrapper-small .archivetitle h2 a, + .home main section .home_wrapper-small .archivedescription h2, + .home main section .home_wrapper-small .archivedescription h2 a, + .search-results main section .home_wrapper-small article h2, + .search-results main section .home_wrapper-small article h2 a, + .search-results main section .home_wrapper-small .archivetitle h2, + .search-results main section .home_wrapper-small .archivetitle h2 a, + .search-results main section .home_wrapper-small .archivedescription h2, + .search-results main section .home_wrapper-small .archivedescription h2 a { + font-size: 3rem; } } @media (min-width: 769px) { .archive main section .home_wrapper-small article h2, .archive main section .home_wrapper-small .archivetitle h2, @@ -1514,19 +1662,7 @@ object { top: 0; background-color: #fff; height: 100%; - padding-left: 4rem; } } - @media (min-width: 769px) and (min-width: 1279px) { - .archive main section .home_wrapper-small article h2, - .archive main section .home_wrapper-small .archivetitle h2, - .archive main section .home_wrapper-small .archivedescription h2, - .home main section .home_wrapper-small article h2, - .home main section .home_wrapper-small .archivetitle h2, - .home main section .home_wrapper-small .archivedescription h2, - .search-results main section .home_wrapper-small article h2, - .search-results main section .home_wrapper-small .archivetitle h2, - .search-results main section .home_wrapper-small .archivedescription h2 { - padding: 5rem; } } - @media (min-width: 769px) { + padding: 0; } .archive main section .home_wrapper-small article h2 a, .archive main section .home_wrapper-small .archivetitle h2 a, .archive main section .home_wrapper-small .archivedescription h2 a, @@ -1536,8 +1672,11 @@ object { .search-results main section .home_wrapper-small article h2 a, .search-results main section .home_wrapper-small .archivetitle h2 a, .search-results main section .home_wrapper-small .archivedescription h2 a { - bottom: 7rem; - width: calc(100% - 8rem); + margin-top: 2.5rem; + margin-right: 2rem; + margin-bottom: 7rem; + margin-left: 5rem; + bottom: 0; height: -moz-max-content; height: max-content; height: -moz-fit-content; @@ -1553,7 +1692,20 @@ object { .search-results main section .home_wrapper-small article h2 a, .search-results main section .home_wrapper-small .archivetitle h2 a, .search-results main section .home_wrapper-small .archivedescription h2 a { - width: calc(100% - 10rem); } } + margin-right: 1rem; + margin-bottom: 6rem; } } + @media (min-width: 769px) and (min-width: 1919px) { + .archive main section .home_wrapper-small article h2 a, + .archive main section .home_wrapper-small .archivetitle h2 a, + .archive main section .home_wrapper-small .archivedescription h2 a, + .home main section .home_wrapper-small article h2 a, + .home main section .home_wrapper-small .archivetitle h2 a, + .home main section .home_wrapper-small .archivedescription h2 a, + .search-results main section .home_wrapper-small article h2 a, + .search-results main section .home_wrapper-small .archivetitle h2 a, + .search-results main section .home_wrapper-small .archivedescription h2 a { + margin-left: 10rem; + margin-bottom: 12rem; } } @media (min-width: 769px) { .archive main section .home_wrapper-small article, .home main section .home_wrapper-small article, @@ -1585,7 +1737,7 @@ object { border-top: #000 1px solid; background-color: transparent; left: calc(5rem); - margin-left: calc((0) * -1); } + margin-left: 0; } .archive main section .home_wrapper-small .archivetitle::before, .home main section .home_wrapper-small .archivetitle::before, .search-results main section .home_wrapper-small .archivetitle::before { @@ -1597,7 +1749,7 @@ object { top: 0; background-color: transparent; z-index: 9; - left: calc((0) * -1); + left: 0; border-left: #000 solid 1px; -moz-transform: skewX(-45deg); -o-transform: skewX(-45deg); @@ -1696,7 +1848,10 @@ object { color: #000; } } @media (min-width: 1279px) { .search-results #content .archivetitle h1 { - font-size: 2.2rem; } } + font-size: 2rem; } } + @media (min-width: 1919px) { + .search-results #content .archivetitle h1 { + font-size: 3rem; } } @media (min-width: 769px) { .search-no-results main { @@ -1796,7 +1951,8 @@ body.category.category-esemeny { flex: 0 0 auto; width: 1px; height: 100%; - background-color: #000; } + background-color: #000; + box-shadow: 0 0 1px transparent; } body.category.category-esemeny main article .event-metadata .bottom-row a.text-link { flex: 1 1 auto; font: 800 1.8rem "Butler"; @@ -2528,7 +2684,8 @@ body.category.category-esemeny { background-color: #000; flex-grow: 0 !important; flex-shrink: 0 !important; - flex-basis: auto !important; } + flex-basis: auto !important; + box-shadow: 0 0 1px transparent; } @media (min-width: 769px) { .single #related_posts, .page #related_posts { @@ -2587,7 +2744,7 @@ body.category.category-esemeny { border-top: #000 1px solid; background-color: transparent; left: calc(5rem); - margin-left: calc((0) * -1); } + margin-left: 0; } .single #related_posts ul li .metadata::before, .page #related_posts ul li .metadata::before { display: block; @@ -2598,7 +2755,7 @@ body.category.category-esemeny { top: 0; background-color: transparent; z-index: 9; - left: calc((0) * -1); + left: 0; border-left: #000 solid 1px; -moz-transform: skewX(-45deg); -o-transform: skewX(-45deg); @@ -2622,6 +2779,18 @@ body.category.category-esemeny { .page #related_posts ul li .metadata .categories, .page #related_posts ul li .metadata .postedon { font-size: 1.2rem; } } + @media (min-width: 769px) and (min-width: 1279px) { + .single #related_posts ul li .metadata .categories, + .single #related_posts ul li .metadata .postedon, + .page #related_posts ul li .metadata .categories, + .page #related_posts ul li .metadata .postedon { + font-size: 1.3rem; } } + @media (min-width: 769px) and (min-width: 1919px) { + .single #related_posts ul li .metadata .categories, + .single #related_posts ul li .metadata .postedon, + .page #related_posts ul li .metadata .categories, + .page #related_posts ul li .metadata .postedon { + font-size: 2.5rem; } } @media (min-width: 769px) { .single #related_posts ul li .metadata .categories, .page #related_posts ul li .metadata .categories { @@ -2644,7 +2813,13 @@ body.category.category-esemeny { .single #related_posts ul li h2 a, .page #related_posts ul li h2, .page #related_posts ul li h2 a { - font-size: 2.2rem; } } + font-size: 2rem; } } + @media (min-width: 769px) and (min-width: 1919px) { + .single #related_posts ul li h2, + .single #related_posts ul li h2 a, + .page #related_posts ul li h2, + .page #related_posts ul li h2 a { + font-size: 3rem; } } @media (min-width: 769px) { .single #related_posts ul li h2, .page #related_posts ul li h2 { diff --git a/js/scripts.js b/js/scripts.js index 738cab6..0a07049 100644 --- a/js/scripts.js +++ b/js/scripts.js @@ -363,16 +363,16 @@ //from the third wrap modify the offset var wNum = parseInt($(nextelem).attr("class").split(" ")[1].split("-")[1]) console.log(wNum) - if (wNum == 3 || !isHome) { - offset = offset - (desktophomemargin /2 ) - } else if (wNum > 4 || !isHome) { + if (wNum == 3) { + offset = offset - (desktophomemargin / 2) + } else if (wNum > 3 || !isHome) { offset = offset - desktophomemargin } } console.log("scrolling to: " + nextelem.attr("class") + " - offset: " + offset) const scrollspeed = isEsemeny ? 500 : 800 - + $('html, body, .wrapper').stop().animate({ scrollLeft: offset }, scrollspeed, function () { //hide the left arrow if on start @@ -540,7 +540,7 @@ }) - $('.misha_loadmore').on("moreload-finish", function () { + $('.misha_loadmore').on("moreload-finish", function (e, scroll) { //wrap new elements on load articleWrapCounter++ @@ -551,18 +551,34 @@ $(".home_wrapper-" + wrapnum).addRandomClasses() //Scroll to new element - currElem = homeScroll(currElem, "next") + if (scroll) { + currElem = homeScroll(currElem, "next") + } + }) /* ----------------------------- loadmore click ----------------------------- */ - $('.misha_loadmore').click(function (e) { - e.preventDefault() - loadmore($(this)) - }); + var touched = false + $('.misha_loadmore')//.click(function (e) { + .on('touchstart', function (e) { + touched = true + }) + .on('touchend', function (e) { + touched = false + e.preventDefault() + loadmore($(this), false) + }) + .on('mouseup', function (e) { + if (touched) { + return + } + e.preventDefault() + loadmore($(this)) + }) var noMoreAjax = false - function loadmore(element) { + function loadmore(element, scroll = true) { if (noMoreAjax) { console.log("no more ajax") return false @@ -594,7 +610,7 @@ button.html('Mutass többet').before(data); // insert new posts misha_loadmore_params.current_page++; - button.trigger("moreload-finish") + button.trigger("moreload-finish", scroll) console.log("loading:", data.length) // you can also fire the "post-load" event here if you use a plugin that requires it diff --git a/sass/_font-mixins.scss b/sass/_font-mixins.scss index e5348cd..477e399 100644 --- a/sass/_font-mixins.scss +++ b/sass/_font-mixins.scss @@ -66,7 +66,24 @@ color: #000; } @media #{$bigdesktop} { - font-size: 2.2rem; + font-size: 2rem; + } + @media #{$verybigdesktop} { + font-size: 3rem; + } +} + +@mixin home-metadata { + font: bold 1rem "Westeinde Caption"; + color: #000; + @media #{$smalldesktop} { + font-size: 1.2rem; + } + @media #{$bigdesktop} { + font-size: 1.3rem; + } + @media #{$verybigdesktop} { + font-size: 2.5rem; } } @@ -81,13 +98,7 @@ } } -@mixin home-metadata { - font: bold 1rem "Westeinde Caption"; - color: #000; - @media #{$smalldesktop} { - font-size: 1.2rem; - } -} + @mixin home-metadata-big { @media #{$smalldesktop} { @@ -201,7 +212,6 @@ @media #{$smalldesktop} { font-size: 3rem; } - @media #{$bigdesktop} { font-size: 3.2rem; } diff --git a/sass/base.scss b/sass/base.scss index 13cee43..224775b 100644 --- a/sass/base.scss +++ b/sass/base.scss @@ -230,6 +230,11 @@ $v-unit-6: 24rem; } @mixin triangle-corner-bordered($radius, $offset, $bgcolor, $bordercolor, $side) { + $minusOffset: calc((#{$offset}) * -1); + @if $offset==0 { + $minusOffset: 0; + } + &::after { //for border without corner position: absolute; @@ -237,6 +242,7 @@ $v-unit-6: 24rem; display: block; top: 0; border: none; + @if $offset==0 { width: calc(100% - #{$radius}); } @else { @@ -248,11 +254,11 @@ $v-unit-6: 24rem; @if $side==left { left: calc(#{$radius}); - margin-left: calc((#{$offset}) * -1); + margin-left: $minusOffset; } @if $side==right { right: calc(#{$radius}); - margin-right: calc((#{$offset}) * -1); + margin-right: $minusOffset; } } &::before { @@ -267,14 +273,14 @@ $v-unit-6: 24rem; z-index: 9; @if $side==left { - left: calc((#{$offset}) * -1); + left: $minusOffset; border-left: $bordercolor solid 1px; @include transform(skewX(-45deg)); transform-origin: left bottom; border-top: $bordercolor solid 1px; } @if $side==right { - right: calc((#{$offset}) * -1); + right: $minusOffset; border-right: $bordercolor solid 1px; @include transform(skewX(45deg)); transform-origin: right bottom; @@ -644,60 +650,6 @@ $v-unit-6: 24rem; } } } - // .sub-wrapper { - // .bedo-sub-wrapper { - // position: fixed; - // display: none; - // right: $h-unit-2; - // left: $h-unit-2; - // top: 0; - // background-color: #000; - // height: 50vh; - // z-index: -1; - // flex-direction: row; - // justify-content: flex-start; - // align-items: center; - // // &:first-child { - // // display: flex; - // // } - // &.opened { - // display: flex; - // } - // a { - // @include bedo-hover-title(); - // @include transform(rotate(-45deg)); - // transform-origin: 50% 50%; - // display: block; - // width: calc(30% + #{$v-unit-6}); - // text-align: center; - // height: fit-content; - // } - // span { - // display: block; - // position: absolute; - // bottom: 0; - // right: 0; - // height: $v-unit-6; - // width: 70%; - // padding: $v-unit-1; - // padding-left: $v-unit-6 + $v-unit-2; - // padding-right: $v-unit-4; - // @include triangle-corner-bordered(#{$v-unit-6}, 0, transparent, #fff, left); - // @include bedo-hover-sub(); - // .circle { - // $diameter: 4rem; - // width: $diameter; - // height: $diameter; - // border-radius: 50%; - // background: #fff; - // position: absolute; - // right: 0; - // top: 0; - // margin: $v-unit-1 / 2; - // } - // } - // } - // } } } //header end @@ -891,6 +843,7 @@ $v-unit-6: 24rem; flex-grow: 0 !important; flex-shrink: 0 !important; flex-basis: auto !important; + box-shadow: 0 0 1px transparent; } .bevezeto, @@ -1035,17 +988,20 @@ $v-unit-6: 24rem; } } //metadata end - /* ------------------------- home article big hover ------------------------- */ + /* --------------------- home article desktop big hover --------------------- */ &.hovered { h2 > a { color: #000; } } } + + /* ------------------------ home article desktop 1 + 2 ----------------------- */ + &.home_wrapper-1 { article { .metadata { - @include triangle-corner-bordered(#{$v-unit-1}, 0, transparent, #000, left); + @include triangle-corner-bordered(#{$v-unit-1}, 1px, transparent, #000, left); .filler { position: relative; } @@ -1061,7 +1017,7 @@ $v-unit-6: 24rem; .metadata { justify-content: flex-end; - @include triangle-corner-bordered(#{$v-unit-1}, 0, transparent, #000, right); + @include triangle-corner-bordered(#{$v-unit-1}, 1px, transparent, #000, right); .filler { order: -1; } @@ -1097,6 +1053,9 @@ $v-unit-6: 24rem; &.home_wrapper-s1.home_wrapper-small.home_wrapper-1 { margin-left: $h-unit-2; } + &:last-child { + margin-right: $h-unit-2; + } article, .archivetitle, @@ -1132,6 +1091,12 @@ $v-unit-6: 24rem; align-items: stretch; @include triangle-corner-bordered(#{$h-unit-1}, 0, transparent, #000, left); display: none; + + @media #{$verybigdesktop} { + height: $h-unit-2; + @include triangle-corner-bordered(#{$h-unit-2}, 0, transparent, #000, left); + } + &.vis { display: flex; } @@ -1139,14 +1104,25 @@ $v-unit-6: 24rem; .categories, .postedon { @include home-metadata(); + display: flex; + flex-direction: row; + align-content: center; + margin-top: auto; + margin-bottom: auto; + flex-wrap: nowrap; + justify-content: center; } .categories { - margin-left: $v-unit-1 * 1.5; - padding: $v-unit-1 / 3 0; - flex: 1 1 auto; + margin-left: $h-unit-1; + @media #{$verybigdesktop} { + margin-left: $h-unit-2; + } + padding-right: $v-unit-1 / 4; + // padding: $v-unit-1 / 3 0; + flex: 1 0 auto; } .postedon { - padding: $v-unit-1 / 3 $v-unit-1 / 4; + padding: 0 $v-unit-1 / 4; flex: 1 0 auto; } } @@ -1162,21 +1138,27 @@ $v-unit-6: 24rem; top: 0; background-color: #fff; height: 100%; - padding-left: $v-unit-1; - @media #{$bigdesktop} { - padding: $h-unit-1; - } + padding: 0; a { - bottom: $h-unit-1 + $v-unit-1 * 0.5; - - width: calc(100% - #{$v-unit-2}); - @include fit-content(height); - position: absolute; + margin-top: $h-unit-1 / 2; + margin-right: $v-unit-1 / 2; + margin-bottom: $h-unit-1 + $v-unit-1 / 2; + margin-left: $h-unit-1; @media #{$bigdesktop} { - width: calc(100% - #{$h-unit-2}); + margin-right: $v-unit-1 / 4; + margin-bottom: $h-unit-1 + $v-unit-1 / 4; } + + @media #{$verybigdesktop} { + margin-left: $h-unit-2; + margin-bottom: $h-unit-2 + $v-unit-1 / 2; + } + + bottom: 0; + @include fit-content(height); + position: absolute; } } } @@ -1335,6 +1317,7 @@ body.category.category-esemeny { width: 1px; height: 100%; background-color: #000; + box-shadow: 0 0 1px transparent; } a.text-link { flex: 1 1 auto; @@ -1358,7 +1341,7 @@ body.category.category-esemeny { main { padding-top: 0; section { - height: 100%; + height: 100%; // padding-top: padding-left: $h-unit-2; @@ -1369,7 +1352,7 @@ body.category.category-esemeny { 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; @@ -1377,7 +1360,7 @@ body.category.category-esemeny { display: flex; flex-direction: column; - justify-content: space-between; + justify-content: space-between; .thumbnailwrapper { height: unset; @@ -1387,7 +1370,7 @@ body.category.category-esemeny { height: unset; max-height: $h-unit-5; @media #{$verybigdesktop} { - max-height: $h-unit-5 + $h-unit-2 + max-height: $h-unit-5 + $h-unit-2; } flex: 1 1 auto; padding: 0; @@ -1395,23 +1378,22 @@ body.category.category-esemeny { // .ev-date{ // padding-left: 2rem; // } - + // padding-right: 2rem; - + // } - .bottom-row{ - h2{ + .bottom-row { + h2 { // padding-left: 2rem; padding-bottom: 2rem; - } - .vr{ + } + .vr { margin: 0 2rem; } - .text-link{ + .text-link { // padding-right: 2rem; padding-bottom: 2rem; } - } } } @@ -1985,6 +1967,7 @@ body.category.category-esemeny { flex-grow: 0 !important; flex-shrink: 0 !important; flex-basis: auto !important; + box-shadow: 0 0 1px transparent; } } }