home-big-thumbnal on mobile

hide alcim if not enough space
Merge branch 'master' of http://git.gyetpet.dynu.net/infeeeee/dis-2019
2019-10-04 15:51:52 +02:00 · 2019-10-04 15:43:25 +02:00 · 2019-10-03 16:19:45 +02:00 · 2019-10-03 16:13:36 +02:00 · 2019-09-13 17:49:22 +02:00 · 2019-09-13 17:48:41 +02:00
12 changed files with 99 additions and 68 deletions
--- a/_teendők.md
+++ b/_teendők.md
@@ -6,7 +6,4 @@ og: tag: pluginnal!

 `@media print{}`

-képaláírás régi, galéria működjön
-
-régi interjú ne legyen dőlt
-
+scroll a galléria nézetben
--- a/css/base.css
+++ b/css/base.css
--- a/functions.php
+++ b/functions.php
@@ -42,7 +42,7 @@ if (function_exists('add_theme_support')) {
    add_image_size('home-big-thumbnail', 1024, 1024, true); // Custom Thumbnail Size call using the_post_thumbnail('home-thumbnail');
    add_image_size('home-small-thumbnail', 256, 256, true); // Custom Thumbnail Size call using the_post_thumbnail('home-thumbnail');
    add_image_size('home-event-thumbnail', 1024, 537, true);
-    add_image_size('single-thumbnail', 1280, 1280, true);
+    add_image_size('single-thumbnail', 1366, 1280, true);

    // Add Support for Custom Backgrounds - Uncomment below if you're going to use
    /*add_theme_support('custom-background', array(
@@ -107,8 +107,8 @@ function dis2019_header_scripts()
        wp_deregister_script('jquery');
        wp_register_script('jquery', get_template_directory_uri() . '/js/lib/jquery-3.3.1.min.js', array(), '3.3.1');

-        wp_register_script('conditionizr', get_template_directory_uri() . '/js/lib/conditionizr-4.3.0.min.js', array(), '4.3.0'); // Conditionizr
-        wp_enqueue_script('conditionizr'); // Enqueue it!
+        // wp_register_script('conditionizr', get_template_directory_uri() . '/js/lib/conditionizr-4.3.0.min.js', array(), '4.3.0'); // Conditionizr
+        // wp_enqueue_script('conditionizr'); // Enqueue it!

        wp_register_script('modernizr', get_template_directory_uri() . '/js/lib/modernizr-custom.js', array(), '2.7.1'); // Modernizr
        wp_enqueue_script('modernizr'); // Enqueue it!
@@ -136,7 +136,7 @@ function dis2019_header_scripts()

        wp_register_script('dis2019scripts', get_template_directory_uri() . '/js/scripts.js', array(
            'jquery',
-            'conditionizr',
+            // 'conditionizr',
            'modernizr',
            'simpler-sidebar',
            'fittext',
--- a/header.php
+++ b/header.php
@@ -23,15 +23,6 @@
 	<meta name="description" content="<?php bloginfo('description');?>">

 	<?php wp_head();?>
-	<script>
-		// conditionizr.com
-		// configure environment tests
-		conditionizr.config({
-			assets: '<?php echo get_template_directory_uri(); ?>',
-			tests: {}
-		});
-	</script>
-
 </head>

 <body <?php body_class();?>>
--- a/js/lib/_del-modernizr-2.7.1.min.js
+++ b/js/lib/_del-modernizr-2.7.1.min.js
--- a/js/lib/_del-snap-scroll.min.js
+++ b/js/lib/_del-snap-scroll.min.js
--- a/js/lib/conditionizr-4.3.0.min.js
+++ b/js/lib/conditionizr-4.3.0.min.js
@@ -1,2 +0,0 @@
-/*! Conditionizr v4.3.0 | (c) 2014 @toddmotto, @markgdyr | MIT license | conditionizr.com */
-!function(a,b){"function"==typeof define&&define.amd?define([],b):"object"==typeof exports?module.exports=b:a.conditionizr=b()}(this,function(){"use strict";var a,b={},c=document.head||document.getElementsByTagName("head")[0],d=function(b,d,e){var f=e?b:a+b+("style"===d?".css":".js");switch(d){case"script":var g=document.createElement("script");g.src=f,c.appendChild(g);break;case"style":var h=document.createElement("link");h.href=f,h.rel="stylesheet",c.appendChild(h);break;case"class":document.documentElement.className+=" "+b}};return b.config=function(c){var e=c||{},f=e.tests;a=e.assets||"";for(var g in f){var h=g.toLowerCase();if(b[h])for(var i=f[g],j=i.length;j--;)d(h,i[j])}},b.add=function(a,c,e){var f=a.toLowerCase();if(b[f]=e(),b[f])for(var g=c.length;g--;)d(f,c[g])},b.on=function(a,c){var d=/^\!/;(b[a.toLowerCase()]||d.test(a)&&!b[a.replace(d,"")])&&c()},b.load=b.polyfill=function(a,c){for(var e=/\.js$/.test(a)?"script":"style",f=c.length;f--;)b[c[f].toLowerCase()]&&d(a,e,!0)},b});
--- a/js/scripts.js
+++ b/js/scripts.js
@@ -862,33 +862,36 @@
 			if (!isMobile) {
 				// let cc = $(this)
 				let cArticle = cc.parents("article")
+				let cH2 = cc.parent('h2')
 				let cMetadata = cArticle.children(".metadata")
 				let cBevezetoWrapper = cMetadata.children(".bevezetoWrapper")
 				let cBevezeto = cBevezetoWrapper.children(".bevezeto")
+				let cAlcimWrapper = cMetadata.children(".alcimWrapper")
+				let cAlcim = cAlcimWrapper.children('.alcim')

 				// calculate default metadata height
-
 				metadataHeights.collapsedHeight = cMetadata[0].getBoundingClientRect().height

+				// check calculated metadata opened height
+				if (!cc.attr('data-metadataOpenedHeight')) {
+					// calculate opened metadata height:
+					let h2H = cH2[0].getBoundingClientRect().height

-				//calculate opened metadata height

-				let h2H = 0
-				$(".home-big h2").each(function () {
-					if ($(this)[0].getBoundingClientRect().height > h2H) {
-						h2H = $(this)[0].getBoundingClientRect().height
-					}
-				})
+					let artH = cArticle[0].getBoundingClientRect().height
+					// metadataHeights.openedHeight = artH - bottomScrollHeight - h2H
+					let metadataMaxheight = artH - bottomScrollHeight - h2H
+					let metadataOpenedHeight = (metadataMaxheight < metadataHeights.collapsedHeight) ? metadataHeights.collapsedHeight : metadataMaxheight
+					cc.attr('data-metadataOpenedHeight', metadataOpenedHeight)
+					// console.log('h2h', h2H, artH)
+				}

-				let artH = cArticle[0].getBoundingClientRect().height
-				metadataHeights.openedHeight = artH - bottomScrollHeight - h2H
-
-				console.log('h2h', h2H, artH)
+				let metadataOpenedHeight = cc.attr('data-metadataOpenedHeight')

 				//add height to bevezetoWrapper
-				$('.bevezetoWrapper').css({ height: metadataHeights.openedHeight })
+				cBevezetoWrapper.css({ height: metadataOpenedHeight })

-				$('.alcimWrapper').css({ height: metadataHeights.openedHeight })
+				cAlcimWrapper.css({ height: metadataOpenedHeight })


 				//add hovered class
@@ -903,31 +906,34 @@
 				cMetadata.children(".categories, .postedon").addClass("transparent")

 				//animate border
-				cMetadata.stop().animate({ height: metadataHeights.openedHeight }, 400, _ => {
+				cMetadata.stop().animate({ height: metadataOpenedHeight }, 400, _ => {

 					//hide metadata
 					cMetadata.children(".categories, .postedon").hide().removeClass("transparent")
-					cMetadata.children(".bevezetoWrapper").show()
-					cMetadata.children(".alcimWrapper").css({ display: 'flex' })
+					cBevezetoWrapper.show()
+					cAlcimWrapper.css({ display: 'flex' }).addClass("transparent")

 					//set height for ellipsis
-					if (!metadataHeights.bevezetoHeight) {
-						metadataHeights.bevezetoHeight = cBevezetoWrapper.height()
+					if (!cc.attr('data-metadataBevezetoHeight')) {
+						let metadataBevezetoHeight = cBevezetoWrapper.height()
 						let bWidth = cBevezetoWrapper.width()
-						// let bWidth = cBevezetoWrapper[0].getBoundingClientRect().width
-						$('.bevezeto').css({
-							height: metadataHeights.bevezetoHeight,
+						cBevezetoWrapper.children('.bevezeto').css({
+							height: metadataBevezetoHeight,
 							width: bWidth + 'px'
 						})
-						$('.alcim').css({
-							height: metadataHeights.bevezetoHeight,
+						cAlcim.css({
+							height: metadataBevezetoHeight,
 						})
-
+						cc.attr('data-metadataBevezetoHeight', metadataBevezetoHeight)
 					}

 					//show bev+alcim
-					cMetadata.children(".bevezetoWrapper, .alcimWrapper").removeClass("transparent")
+					cBevezetoWrapper.removeClass("transparent")

+					//only show alcim, if enough space
+					if (!(cAlcim.children('.alcimInner').height() > cAlcim.height())) {
+						cAlcimWrapper.removeClass("transparent")
+					}

 					//clamp bevezető
 					let ellipsis = new Ellipsis(cBevezeto[0]);
@@ -940,7 +946,7 @@
 		// Uncomment for debugging hover
 		// if (!isMobile && isHome) {
 		// 	setTimeout(() => {
-		// 		bigArticleHoverShow($(".home_wrapper-1 .home-big h2 a"))
+		// 		bigArticleHoverShow($(".home_wrapper-2 .home-big h2 a"))
 		// 	}, 2000);
 		// }

@@ -1054,7 +1060,7 @@
 			/* ----------------------------- images, gallery ---------------------------- */

 			//wrap old galleries
-			$('.single-content>p, .single-content>wp-caption').each(function () {
+			$('.single-content>p, .single-content>.wp-caption').each(function () {
 				let nrOfImgs = $(this).children('img').length
 				if (nrOfImgs > 1) {
 					$(this).addClass('wp-block-gallery')
@@ -1064,8 +1070,25 @@
 			})

 			//wrap images on old posts
-			$('.single-content div.wp-caption img, .single-content>.wp-block-image>img, .single-content>.wp-block-gallery>img').each(function () {
-				let src = $(this).attr('src')
+			$('.single-content>.wp-block-image>img, .single-content>.wp-block-gallery>img').each(function () {
+				var src = $(this).attr('src')
+				var datasrc = $(this).attr('data-src')
+
+				var srcArr = src.split('.')
+				switch (srcArr[srcArr.length - 1]) {
+					case 'jpg':
+					case 'png':
+					case 'jpeg':
+					case 'gif':
+
+						break;
+					default:
+						if (datasrc) {
+							src = datasrc
+						}
+						break;
+				}
+
 				$(this).wrap('<a class="cb-gallery" href="' + src + '" ></a>')
 				// $(this).parent('p').addClass('wp-block-image')
 			})
--- a/sass/_font-mixins.scss
+++ b/sass/_font-mixins.scss
@@ -198,13 +198,9 @@
 }

@mixin single-author {
-  @include single-metadata();
-  font-size: 2rem;
+  font: bold 2rem "Westeinde Caption";
  color: #fff;
  -webkit-text-stroke: #000 1px;
-  @media #{$smalldesktop} {
-    font-size: 3rem;
-  }
 }

@mixin single-h2 {
@@ -240,8 +236,24 @@
 }

@mixin related-title {
-  font: 500 2rem "Westeinde Caption";
+  font: 500 2rem "Westeinde Caption" !important;
  line-height: 1.3;
+  @media #{$tablet} {
+    font-size: 0.9rem !important;
+  }
+  @media #{$smalldesktop} {
+    font-size: 1.3rem !important;
+  }
+  @media #{$bigdesktop} {
+    font-size: 1.6rem !important;
+  }
+}
+
+@mixin related-metadata {
+  @include home-metadata();
+  @media #{$verybigdesktop} {
+    font-size: 1.6rem !important;
+  }
 }

 /* ---------------------------------- event --------------------------------- */
--- a/sass/base.scss
+++ b/sass/base.scss
@@ -1870,7 +1870,12 @@ $padd: 2rem;
    .thumbnailwrapper {
      padding: 0;

-      img.attachment-post-thumbnail {
+      img.attachment-single-thumbnail {
+        //use home-big-thumbnail on mobile
+        display: none;
+      }
+
+      img.attachment-home-big-thumbnail {
        // post thumbnail on home
        height: 75vh;
        width: 100vw;
@@ -1972,9 +1977,13 @@ $padd: 2rem;
        bottom: 0;
        width: 100%;

+        img.attachment-home-big-thumbnail {
+          display: none;
+        }
+
        img.attachment-single-thumbnail {
          // post thumbnail on home
-
+          display: block;
          object-fit: cover;
          padding: 0;

@@ -2116,6 +2125,10 @@ $padd: 2rem;
          top: 0.5rem;
          left: 2rem;
        }
+        em {
+          //fix italics in old articles
+          font-style: normal;
+        }
      }

      //nagyon nagy kiemelt
@@ -2490,6 +2503,9 @@ $padd: 2rem;
        flex-wrap: nowrap;
        align-items: center;
        padding: 0;
+        * {
+          @include related-metadata();
+        }

        .vr {
          height: 100%;
--- a/singular.php
+++ b/singular.php
@@ -13,6 +13,7 @@
 				<?php if (has_post_thumbnail()): // Check if Thumbnail exists ?>
 					<div class="thumbnailwrapper">
 						<?php the_post_thumbnail('single-thumbnail'); ?>
+						<?php the_post_thumbnail('home-big-thumbnail'); ?>
 					</div>

 				<?php endif;?>
@@ -75,7 +76,7 @@
 							
 					<!-- Facebook -->
 					<?php
-						if ($categories) {
+						if (is_single()) {
 					?>
 						<div class="fb-like" data-href="<?php the_permalink();?>" data-width="" data-layout="button_count" data-action="like" data-size="small" data-show-faces="false" data-share="true"></div>
 						<div class="fb-page" data-href="https://www.facebook.com/designisso/" data-tabs="" data-width="" data-height="" data-small-header="true" data-adapt-container-width="true" data-hide-cover="false" data-show-facepile="false"><blockquote cite="https://www.facebook.com/designisso/" class="fb-xfbml-parse-ignore"><a href="https://www.facebook.com/designisso/">designisso</a></blockquote></div>
@@ -131,7 +132,7 @@
 				

 				<?php
-						if ($categories) {
+						if (is_single()) {
 					?>
 				<div class="toHome">
 					<a href="<?php echo esc_url( home_url( '/' ) ); ?>">
--- a/style.css
+++ b/style.css
@@ -2,7 +2,7 @@
 	Theme Name: dis-2019
 	Theme URI: https://git.gyetpet.dynu.net/infeeeee/dis-2019
 	Description: Designisso téma 2019 | <a target="_blank" href="https://git.gyetpet.dynu.net/infeeeee/dis-2019/src/branch/master/K%c3%89ZIK%c3%96NYV.md">Használati utasítás magyarul</a> | <a target="_blank" href="https://git.gyetpet.dynu.net/infeeeee/dis-2019/issues">Hibák, problémák jelentése</a>
-	Version: 1.0.5
+	Version: 1.0.10
 	Author: Gyetvai Péter
 	Author URI: https://gyetvai-peter.hu
 	Tags: Designisso
Author	SHA1	Message	Date
infeeeee	be6fc66034	home-big-thumbnal on mobile	2019-10-04 15:51:52 +02:00
infeeeee	86bc0e72b7	hide alcim if not enough space	2019-10-04 15:43:25 +02:00
infeeeee	c74d515a8a	Merge branch 'master' of http://git.gyetpet.dynu.net/infeeeee/dis-2019	2019-10-03 16:19:45 +02:00
infeeeee	ea09fa398b	work on alcim on big articles	2019-10-03 16:13:36 +02:00
Péter Gyetvai	2a4bf1719f	bump 1.0.10	2019-09-13 17:49:22 +02:00
Péter Gyetvai	cbfeec7209	changed image sizes	2019-09-13 17:48:41 +02:00
Péter Gyetvai	e39cbe2022	bump 1.0.9	2019-09-13 17:23:18 +02:00
Péter Gyetvai	7bf40452c3	changed home-big-thumbnail size	2019-09-13 17:21:51 +02:00
infeeeee	ea796f041b	bump 1.0.8	2019-09-13 16:29:58 +02:00
infeeeee	69a36eb456	fixed related post font size	2019-09-13 16:29:22 +02:00
infeeeee	810fdd7489	removed conditionizr and unused js libs	2019-09-13 16:14:50 +02:00
infeeeee	ec3e5525a5	fix lazyload on old images	2019-09-13 16:11:23 +02:00
infeeeee	f0e2e44980	change author text size	2019-09-13 15:46:23 +02:00
infeeeee	98fc38b770	fix italics in blockquote in old articles	2019-09-13 15:34:32 +02:00
infeeeee	50f424cfa7	show facebook boxes on bottom of single	2019-09-13 15:30:23 +02:00
infeeeee	f37bc329af	todo update	2019-09-11 19:57:44 +02:00
infeeeee	f9b7bb5d3a	mobile thumbnail fixed	2019-09-11 19:55:42 +02:00
infeeeee	5ba4282209	1.0.6	2019-09-11 19:49:49 +02:00