bump 1.0.13

category-esemeny.php

@@ -4,85 +4,9 @@
 		<!-- section -->
 		<section>
 
-		<?php if (have_posts()): while (have_posts()): the_post();?>
+		<?php include locate_template('loop-esemeny.php', false, false);?>
-
-		<?php
-				$event_datum = get_post_meta( get_the_ID(), 'dis-esemeny-datum', true );
-				$event_link = get_post_meta( get_the_ID(), 'dis-esemeny-link', true );	
-		?>
-
-
-		<article id="post-<?php the_ID();?>" <?php post_class();?>>
-
-			<!-- post thumbnail -->
-			<?php if (has_post_thumbnail()): // Check if thumbnail exists ?>
-				<a class="thumbnailwrapper" href="<?php echo $event_link; ?>" title="<?php the_title();?>" target="_blank">
-					<?php the_post_thumbnail('home-event-thumbnail');?>
-				</a>
-			<?php endif;?>
-			<!-- /post thumbnail -->
-
-			<div class="event-metadata">
-				
-
-				<div class="top-row">
-					<div class="ev-date">
-						<?php
-							echo preg_replace('/^(\d{4}\.)(\d{2}\.)(\d{2}\.)$/','\1</br>\2 \3',$event_datum );
-							// echo $event_datum;
-						?>
-					</div>
-
-						<!-- Arrow -->
-						<a href="<?php echo $event_link; ?>" target="_blank" class="arrow-link">
-							→
-						</a>
-
-					</div>
-				<div class="hr">
-				
-				</div>
-				<div class="bottom-row">
-					<!-- title -->
-					<h2>
-						<a href="<?php echo $event_link; ?>" target="_blank"><?php the_title();?></a>
-						
-					</h2>
-					<div class="vr"></div>
-					<!-- Tovább button -->
-					<a href="<?php echo $event_link; ?>" class="text-link" target="_blank">Tovább az eseményre</a>
-				</div>
-	
-			</div><!-- end event-metadata -->
-			
-
-			
-
-			
-
-
-			<!-- post title -->
-			
-			<!-- /post title -->
-
-
-
-		</article>
-
-
-		<?php endwhile;?>
-
-	<?php else: ?>
-
-<!-- article -->
-<article>
-	<h2><?php _e('Sorry, nothing to display.', 'dis2019');?></h2>
-</article>
-<!-- /article -->
-
-<?php endif;?>
-
 
+<?php get_template_part('loadmore');?>
 
 		</section>
 		<!-- /section -->

functions.php

@@ -36,9 +36,9 @@ if (function_exists('add_theme_support')) {
 
     // Add Thumbnail Theme Support
     add_theme_support('post-thumbnails');
-    add_image_size('large', 700, '', true); // Large Thumbnail
+    // add_image_size('large', 700, '', true); // Large Thumbnail
-    add_image_size('medium', 250, '', true); // Medium Thumbnail
+    // add_image_size('medium', 250, '', true); // Medium Thumbnail
-    add_image_size('small', 120, '', true); // Small Thumbnail
+    // add_image_size('small', 120, '', true); // Small Thumbnail
     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);
@@ -119,7 +119,7 @@ function dis2019_header_scripts()
         wp_register_script('fittext', get_template_directory_uri() . '/js/lib/jquery.fittext.js', array('jquery'), '1.0.0'); //
         wp_enqueue_script('fittext'); // Enqueue it!
 
-        wp_register_script('jquery.colorbox', get_template_directory_uri() . '/js/lib/jquery.colorbox-min.js', array('jquery'), '1.0.0'); //
+        wp_register_script('jquery.colorbox', get_template_directory_uri() . '/js/lib/jquery.colorbox-wpretina.js', array('jquery'), '1.0.0'); //
         wp_enqueue_script('jquery.colorbox'); // Enqueue it!
 
         wp_register_script('lettering', get_template_directory_uri() . '/js/lib/jquery.lettering.js', array('jquery'), '1.0.0'); //
@@ -131,7 +131,7 @@ function dis2019_header_scripts()
         wp_register_script('ftellipsis', get_template_directory_uri() . '/js/lib/ftellipsis.min.js', array(), '1.0.0'); //
         wp_enqueue_script('ftellipsis'); // Enqueue it!
 
-        wp_register_script('touchSwipe', get_template_directory_uri() . '/js/lib/jquery.touchSwipe.min.js', array('jquery'), '1.6.18'); //
+        wp_register_script('touchSwipe', get_template_directory_uri() . '/js/lib/jquery.touchSwipe-1.6.18.min.js', array('jquery'), '1.6.19'); //
         wp_enqueue_script('touchSwipe'); // Enqueue it!
 
         wp_register_script('dis2019scripts', get_template_directory_uri() . '/js/scripts.js', array(
@@ -480,7 +480,12 @@ function misha_loadmore_ajax_handler()
     $args['offset'] = $offset + (($_POST['page'] - 1) * $ppp);
 
     query_posts($args);
+
+    if (($args[category_name] == get_theme_mod('dis-2019-event-cat-slug', 'esemeny'))) {
+        get_template_part('loop-esemeny');
+    }else{
         get_template_part('loop');
+    }
 
     die; // here we exit the script and even no wp_reset_query() required!
 }
@@ -517,7 +522,7 @@ function dis_2019_order_events_by_date(&$query)
     $query->set('orderby', 'meta_value');
     $query->set('order', 'ASC');
     $query->set('meta_value', date("Y.m.d.")); // change to how "event date" is stored
-    $query->set('meta_compare', '>');
+    $query->set('meta_compare', '>=');
 }
 add_action('pre_get_posts', 'dis_2019_order_events_by_date', 1);
 

gulpfile.js

@@ -28,9 +28,11 @@ gulp.task('liverel', function () {
 // });
 
 gulp.task('watch', function () {
-    livereload.listen()
+
     gulp.watch('./sass/**/*.scss', gulp.series('sass'))
     gulp.watch(['./**', '!./node_modules/**'], gulp.series('liverel'))
+    livereload.listen()
+
 });
 
 gulp.task('minify-svg', function () {

js/scripts.js

@@ -1123,6 +1123,18 @@
 
 			const lightBoxMaxHeight = isMobile ? '65%' : '80%'
 
+			function prevdev(e) {
+				e.preventDefault();
+			}
+
+			const disableScroll = function () {
+				document.addEventListener('touchmove', prevdev, { passive: false })
+			}
+
+			const enableScroll = function () {
+				document.removeEventListener('touchmove', prevdev, { passive: false })
+			}
+
 			//http://www.jacklmoore.com/colorbox/
 			const colorboxSettings = {
 				transition: 'none',
@@ -1136,7 +1148,11 @@
 				next: '',
 				close: '',
 				xhrError: 'A tartalom betöltése nem sikerült. Kérlek próbáld meg később.',
-				imgError: 'A kép betöltése nem sikerült. Kérlek próbáld meg később.'
+				imgError: 'A kép betöltése nem sikerült. Kérlek próbáld meg később.',
+				onOpen: disableScroll,
+				onClosed: enableScroll,
+				retinaUrl: true,
+				retinaSuffix: '$1.$2'
 
 			}
 
@@ -1144,17 +1160,10 @@
 			$('#cboxOverlay, #colorbox').swipe({
 				swipeLeft: function () {
 					$.colorbox.next()
-
 				},
 				swipeRight: function () {
 					$.colorbox.prev()
 				},
-				swipeUp: function () {
-					return false
-				},
-				swipeDown: function () {
-					return false
-				},
 			})
 
 			// lightbox for galleries

loop-esemeny.php

@@ -0,0 +1,77 @@
+<?php if (have_posts()): while (have_posts()): the_post();?>
+
+		<?php
+				$event_datum = get_post_meta( get_the_ID(), 'dis-esemeny-datum', true );
+				$event_link = get_post_meta( get_the_ID(), 'dis-esemeny-link', true );	
+		?>
+
+
+		<article id="post-<?php the_ID();?>" <?php post_class();?>>
+
+			<!-- post thumbnail -->
+			<?php if (has_post_thumbnail()): // Check if thumbnail exists ?>
+				<a class="thumbnailwrapper" href="<?php echo $event_link; ?>" title="<?php the_title();?>" target="_blank">
+					<?php the_post_thumbnail('home-event-thumbnail');?>
+				</a>
+			<?php endif;?>
+			<!-- /post thumbnail -->
+
+			<div class="event-metadata">
+				
+
+				<div class="top-row">
+					<div class="ev-date">
+						<?php
+							echo preg_replace('/^(\d{4}\.)(\d{2}\.)(\d{2}\.)$/','\1</br>\2 \3',$event_datum );
+							// echo $event_datum;
+						?>
+					</div>
+
+						<!-- Arrow -->
+						<a href="<?php echo $event_link; ?>" target="_blank" class="arrow-link">
+							→
+						</a>
+
+					</div>
+				<div class="hr">
+				
+				</div>
+				<div class="bottom-row">
+					<!-- title -->
+					<h2>
+						<a href="<?php echo $event_link; ?>" target="_blank"><?php the_title();?></a>
+						
+					</h2>
+					<div class="vr"></div>
+					<!-- Tovább button -->
+					<a href="<?php echo $event_link; ?>" class="text-link" target="_blank">Tovább az eseményre</a>
+				</div>
+	
+			</div><!-- end event-metadata -->
+			
+
+			
+
+			
+
+
+			<!-- post title -->
+			
+			<!-- /post title -->
+
+
+
+		</article>
+
+
+		<?php endwhile;?>
+
+	<?php else: ?>
+
+<!-- article -->
+<article>
+	<h2><?php _e('Sorry, nothing to display.', 'dis2019');?></h2>
+</article>
+<!-- /article -->
+
+<?php endif;?>

sass/_print.scss

@@ -3,18 +3,18 @@
 \*------------------------------------*/
 
 ::selection {
-	background:#04A4CC;
+  background: #04a4cc;
-	color:#FFF;
+  color: #fff;
   text-shadow: none;
 }
 ::-webkit-selection {
-	background:#04A4CC;
+  background: #04a4cc;
-	color:#FFF;
+  color: #fff;
   text-shadow: none;
 }
 ::-moz-selection {
-	background:#04A4CC;
+  background: #04a4cc;
-	color:#FFF;
+  color: #fff;
   text-shadow: none;
 }
 
@@ -55,8 +55,8 @@ a img.aligncenter {
   margin-right: auto;
 }
 .wp-caption {
-	background:#FFF;
+  background: #fff;
-	border:1px solid #F0F0F0;
+  border: 1px solid #f0f0f0;
   max-width: 96%;
   padding: 5px 3px 10px;
   text-align: center;
@@ -86,10 +86,8 @@ a img.aligncenter {
   padding: 0 4px 5px;
 }
 .sticky {
-
 }
 .bypostauthor {
-
 }
 
 /*------------------------------------*\
@@ -97,7 +95,20 @@ a img.aligncenter {
 \*------------------------------------*/
 
 @media print {
+  @page {
+    margin: 2cm;
+  }
+
+  html {
+    overflow-y: unset !important;
+  }
+
   * {
+    -webkit-print-color-adjust: exact;
+    color-adjust: exact !important;
+  }
+
+  *:not(header *) {
     background: transparent !important;
     color: #000 !important;
     box-shadow: none !important;
@@ -118,14 +129,16 @@ a img.aligncenter {
   a[href^="#"]:after {
     content: "";
   }
-	pre,blockquote {
+  pre,
+  blockquote {
     border: 1px solid #999;
     page-break-inside: avoid;
   }
   thead {
     display: table-header-group;
   }
-	tr,img {
+  tr,
+  img {
     page-break-inside: avoid;
   }
   img {
@@ -144,4 +157,137 @@ a img.aligncenter {
   h3 {
     page-break-after: avoid;
   }
+
+  //structure
+  .wrapper {
+    height: unset !important;
+  }
+
+  //header
+
+  header {
+    position: relative !important;
+    flex-direction: column !important;
+    align-items: flex-start !important;
+    justify-content: flex-start !important;
+    padding: 2rem !important;
+    .header-inner {
+      flex-direction: column !important;
+      justify-content: flex-start;
+      align-items: flex-start !important;
+      padding: 0 2rem !important;
+      .dis-logo {
+        background-image: url(../img/dis-logo-black.png) !important;
+        background-image: url(../img/dis-logo-black.svg) !important;
+        margin-bottom: 1rem;
+      }
+      a {
+        display: flex !important;
+        flex-direction: row;
+        justify-content: flex-start;
+        align-items: center;
+        div {
+          margin-right: 2rem;
+        }
+      }
+      .menubutton {
+        display: none;
+      }
+      .social-link {
+        display: block !important;
+        margin: 0.5rem 2rem !important;
+      }
+      .events-link {
+        display: none;
+      }
+    }
+  }
+
+  //masonrypage
+  .masonrypage {
+    article {
+      min-height: unset !important;
+
+      a.thumbnailwrapper {
+        img {
+          height: 50vw !important;
+          width: 100vw !important;
+        }
+        &:after {
+          content: "";
+        }
+      }
+
+      h2 {
+        display: block !important;
+        padding-bottom: 5rem !important;
+      }
+
+      .metadata {
+        top: calc(50vw - 5rem + 1px) !important;
+        position: absolute;
+        // border-top: 1px solid #000;
+        @include fit-content(width);
+        height: $h-unit-1;
+        background-color: #fff;
+
+        @include triangle-corner-bordered(#{$h-unit-1}, #{$h-unit-1}, white, #000, left);
+        &::after {
+          display: block !important;
+        }
+      }
+    }
+  }
+
+  //single
+  .singularpage {
+    .titlewrapper {
+      padding-top: 2rem !important;
+      .metadata {
+        a {
+          text-decoration: none;
+          &::after {
+            content: "";
+          }
+        }
+      }
+    }
+
+    .single-content {
+      hr.content-begin {
+        margin-top: 2rem !important;
+      }
+
+      a.cboxElement::after {
+        content: "" !important;
+      }
+
+      figcaption {
+        display: block !important;
+      }
+
+      .alignleft,
+      .alignright,
+      .wp-block-image {
+        page-break-inside: avoid;
+        width: 100% !important;
+        height: auto;
+        img {
+          page-break-inside: avoid;
+          width: 100%;
+          height: auto;
+        }
+	  }
+	  &::after{
+		content: "A fák érdekében feleslegesen ne nyomtasd ki ezt a cikket. A papírszemetet gyűjtsd szelektíven!";
+		top: 3rem;
+		position: relative;
+	  }
+    }
+    .fb-like,
+    .fb-page,
+    .toHome {
+      display: none !important;
+    }
+  }
 }

sass/base.scss

@@ -267,7 +267,6 @@ $v-unit-6: 24rem;
     top: 0;
     background-color: $bgcolor;
     z-index: 9;
-
     @if $side==left {
       left: $minusOffset;
       border-left: $bordercolor solid 1px;
@@ -505,6 +504,9 @@ $v-unit-6: 24rem;
         background-image: url(../img/#{$iconname}-black.png);
         background-image: url(../img/#{$iconname}-black.svg);
       }
+      @media print {
+        background-image: url(../img/#{$iconname}-black.png);
+      }
     }
 
     .facebook-icon {
@@ -568,7 +570,7 @@ $v-unit-6: 24rem;
     .events-link {
       margin: 0 2rem 0 0;
       &.hidden {
-        display: none !important;
+        display: none;
       }
       @media #{$tablet} {
         margin: 0;
@@ -1675,7 +1677,7 @@ body.category.category-esemeny {
       height: 85vw;
       max-height: calc(50vw + 180px);
       .thumbnailwrapper {
-        height: 50vw;
+        // height: 50vw;
         img {
           width: 100%;
           height: 100%;
@@ -1825,6 +1827,13 @@ body.category.category-esemeny {
             }
           }
         }
+
+        /* ---------------------- loadmore on desktop on events --------------------- */
+
+        .misha_loadmore{
+          width: calc(50vw - #{$h-unit-4} - #{$h-unit-2});
+          max-width: unset;
+        }
       }
     }
   }
@@ -1900,12 +1909,14 @@ $padd: 2rem;
         width: calc(100vw - #{$h-unit-1});
         bottom: unset !important;
         height: $h-unit-1;
+        // height: calc(#{$h-unit-1} - 0.5px);
         position: relative;
         align-self: flex-end;
         display: flex;
         flex-direction: column;
         justify-content: center;
         padding-left: 0;
+        // border-left: #fff solid 1px;
 
         @include single-metadata();
 
@@ -1924,6 +1935,7 @@ $padd: 2rem;
           .time-cat::after {
             content: " ";
             display: inline-block;
+            white-space: pre;
           }
           .format::before {
             content: "|";
@@ -2715,7 +2727,7 @@ body.page {
   //metadata on mobile
 
   .metadata {
-    @media #{$only-mobile} {
+    @media #{$only-mobile}, print {
       color: $color !important;
       .vr {
         background-color: $color !important;
@@ -2726,7 +2738,7 @@ body.page {
       color: $color !important;
     }
 
-    @media #{$only-mobile} {
+    @media #{$only-mobile}, print {
       &::before,
       &::after {
         border-color: $color !important;
@@ -2734,7 +2746,7 @@ body.page {
     }
   }
   h2 {
-    @media #{$only-mobile} {
+    @media #{$only-mobile}, print {
       border-top-color: $color !important;
     }
   }

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.10
+	Version: 1.0.13
 	Author: Gyetvai Péter
 	Author URI: https://gyetvai-peter.hu
 	Tags: Designisso