Compare commits

..

No commits in common. "233a56b670b477aeb902de347f9597e95f7f2347" and "5c05c0f1e370010fc8935405b61a0f0fdec52296" have entirely different histories.

8 changed files with 73 additions and 91 deletions

View File

@ -29,8 +29,7 @@ endif;
<main> <main>
<?php <?php
// https://codex.wordpress.org/Conditional_Tags // https://codex.wordpress.org/Conditional_Tags
// if ( is_post_type_archive ( 'archive_resource' ) ) : if ( is_post_type_archive ( 'archive_resource' ) ) :
if ( is_post_type_archive ( 'archive_resource' ) || is_tax( 'archive_resource_category' ) || is_tax( 'archive_resource_tag' ) ) :
//https://developer.wordpress.org/reference/functions/get_template_part/#comment-4130 //https://developer.wordpress.org/reference/functions/get_template_part/#comment-4130
//get_template_part( 'template-parts/section', 'resources', array( 'post_per_page' => '10' ) ); //get_template_part( 'template-parts/section', 'resources', array( 'post_per_page' => '10' ) );
get_template_part( 'template-parts/archive', 'resources'); get_template_part( 'template-parts/archive', 'resources');
@ -52,6 +51,7 @@ endif;
</h2> </h2>
</header> </header>
<main class=""> <main class="">
<?php if ( have_posts() ) : ?> <?php if ( have_posts() ) : ?>
<?php while ( have_posts() ) : the_post(); ?> <?php while ( have_posts() ) : the_post(); ?>
@ -86,14 +86,12 @@ endif;
<?php //pagination here ?> <?php //pagination here ?>
<aside> <aside>
<nav> <nav>
<div class="post-next"><?php next_posts_link( __( '&larr; Older', 'foundationpress' ) ); ?></div> <!--a href="" class="button hollow">see more news</a-->
<div class="post-previous"><?php previous_posts_link( __( 'Newer &rarr;', 'foundationpress' ) ); ?></div>
</nav> </nav>
</aside> </aside>
<?php else : //if no post in query ?> <?php else : //if no post in query ?>
<p><?php _e( 'Sorry, no posts matched your criteria.' ); ?></p> <p><?php _e( 'Sorry, no posts matched your criteria.' ); ?></p>
<?php endif; ?> <?php endif; ?>
</section>
<?php <?php

File diff suppressed because one or more lines are too long

View File

@ -476,15 +476,15 @@ main {
} }
} }
} }
.archive-posts.resources{ .hero-announcement {
header { &.resources{
}
.hero-announcement {
.slides { .slides {
&.announcement.middle { &.announcement.middle {
margin-top: 0; margin-top: 0;
padding-top: $global-padding; // .widget_nav_menu,.widget_tag_cloud {
// width: auto;
// overflow: visible;
// }
} }
} }
} }

View File

@ -161,12 +161,6 @@
} }
} }
} }
.breadcrumbs {
color: scale-color($anchor-color, $saturation: -50%, $lightness: 60%);
font-size: $global-font-size *1.2;
margin:0;
padding:0;
}
@include breakpoint(small){ @include breakpoint(small){
} }
@include breakpoint(medium){ @include breakpoint(medium){

View File

@ -27,9 +27,8 @@ get_header(); ?>
<?php echo get_search_query( ); ?> <?php echo get_search_query( ); ?>
</h2> </h2>
</header> </header>
<aside class="hero hero-announcement resources">
<?php dynamic_sidebar( 'announcement-resources-middle-widgets' ); ?>
</aside>
<main class=""> <main class="">
<?php if ( have_posts() ) : ?> <?php if ( have_posts() ) : ?>
<?php while ( have_posts() ) : the_post(); ?> <?php while ( have_posts() ) : the_post(); ?>

View File

@ -476,15 +476,15 @@ main {
} }
} }
} }
.archive-posts.resources{ .hero-announcement {
header { &.resources{
}
.hero-announcement {
.slides { .slides {
&.announcement.middle { &.announcement.middle {
margin-top: 0; margin-top: 0;
padding-top: $global-padding; // .widget_nav_menu,.widget_tag_cloud {
// width: auto;
// overflow: visible;
// }
} }
} }
} }

View File

@ -161,12 +161,6 @@
} }
} }
} }
.breadcrumbs {
color: scale-color($anchor-color, $saturation: -50%, $lightness: 60%);
font-size: $global-font-size *1.2;
margin:0;
padding:0;
}
@include breakpoint(small){ @include breakpoint(small){
} }
@include breakpoint(medium){ @include breakpoint(medium){

View File

@ -21,25 +21,21 @@
<section class="archive-posts resources"> <section class="archive-posts resources">
<header> <header>
<h2>Resources <?php //post_type_archive_title(); ?></h2> <h2>
<h4 class="breadcrumbs">
<?php <?php
if ( is_tax( 'archive_resource_category' ) ): if ( is_post_type_archive() ):
single_cat_title( '<span class="h6"></span> ' ); post_type_archive_title();
elseif ( is_tax( 'archive_resource_tag' ) ):
single_term_title( '<span class="h5">#</span>' );
else:
echo '&nbsp;';
endif; endif;
?> ?>
</h4> </h2>
</header> </header>
<aside class="hero hero-announcement resources"> <aside class="hero hero-announcement resources">
<?php dynamic_sidebar( 'announcement-resources-middle-widgets' ); ?> <?php dynamic_sidebar( 'announcement-resources-middle-widgets' ); ?>
</aside> </aside>
<main class=""> <main class="">
<?php if ( have_posts() ) : ?> <?php $the_query = new WP_Query( array( 'post_type' => get_post_type( get_the_ID() ), 'posts_per_page' => '10' , 'paged' => $paged ) ); ?>
<?php while ( have_posts() ) : the_post(); ?> <?php if ( $the_query->have_posts() ) : ?>
<?php while ( $the_query->have_posts() ) : $the_query->the_post(); ?>
<article class=""> <article class="">
<?php if ( has_post_thumbnail() ) :?> <?php if ( has_post_thumbnail() ) :?>
<a href="<?php the_permalink(); ?>" rel="bookmark" title="<?php the_title(); ?>"> <a href="<?php the_permalink(); ?>" rel="bookmark" title="<?php the_title(); ?>">
@ -53,7 +49,7 @@
</a> </a>
<?php endif;?> <?php endif;?>
<h5 class="date"> <h5 class="date">
<?php //the_date('d.m.Y');?> <?php the_date('Y');?>
</h5> </h5>
<h3 class="entry-title"> <h3 class="entry-title">
<a href="<?php the_permalink(); ?>" rel="bookmark"> <a href="<?php the_permalink(); ?>" rel="bookmark">
@ -67,15 +63,16 @@
</section> </section>
</article> </article>
<?php endwhile;//end of the loop ?> <?php endwhile;//end of the loop ?>
</main>
<?php //pagination here ?> <?php //pagination here ?>
<?php wp_reset_postdata(); ?>
<?php else : //if no post in query ?>
<p><?php _e( 'Sorry, no posts matched your criteria.' ); ?></p>
<?php endif; ?>
</main>
<aside> <aside>
<nav> <nav>
<div class="post-next"><?php next_posts_link( __( '&larr; Older', 'foundationpress' ) ); ?></div> <div class="post-next"><?php next_posts_link( __( '&larr; Older', 'foundationpress' ) ); ?></div>
<div class="post-previous"><?php previous_posts_link( __( 'Newer &rarr;', 'foundationpress' ) ); ?></div> <div class="post-previous"><?php previous_posts_link( __( 'Newer &rarr;', 'foundationpress' ) ); ?></div>
</nav> </nav>
</aside> </aside>
<?php else : //if no post in query ?>
<p><?php _e( 'Sorry, no posts matched your criteria.' ); ?></p>
<?php endif; ?>
</section> </section>