Continued developing the grid layout variation for search and archives

strangerstudios · Feb 17, 2022 · 348a659 · 348a659
1 parent dbdbaaf
commit 348a659
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 9 deletions.
diff --git a/archive.php b/archive.php
@@ -13,17 +13,35 @@
 		<?php do_action( 'memberlite_before_loop' ); ?>
 
 		<?php if ( have_posts() ) : ?>
+			<?php
+				/**
+				 * Wrap posts output in the .grid-list class based on settings.
+				 */
+				$content_archives = get_theme_mod( 'content_archives', $memberlite_defaults['content_archives'] );
+				if ( $content_archives === 'grid' ) { ?>
+					<div class="grid-list">
+				<?php }
+			?>
 			<?php while ( have_posts() ) :
 				the_post(); ?>
-				<?php get_template_part( 'components/post/content', get_post_format() ); ?>
+				<?php
+					/**
+					 * Load the grid-style content part based on settings.
+					 */
+					if ( $content_archives === 'grid' ) {
+						get_template_part( 'components/post/content', 'grid' );
+					} else {
+						get_template_part( 'components/post/content', get_post_format() );
+					}
+				?>
 			<?php endwhile; ?>
-
+			<?php if ( $content_archives === 'grid' ) { ?>
+				</div> <!-- end .grid-list -->
+			<?php } ?>
 			<?php memberlite_paging_nav(); ?>
-
 		<?php else : ?>
 			<?php get_template_part( 'content', 'none' ); ?>
 		<?php endif; ?>
-
 		<?php do_action( 'memberlite_after_loop' ); ?>
 		</main><!-- #main -->
 		<?php do_action( 'memberlite_after_main' ); ?>

diff --git a/components/post/entry-header.php b/components/post/entry-header.php
@@ -31,7 +31,7 @@
 	?>
 
 	<header class="entry-header">
-		<?php if ( 'post' == get_post_type() ) : ?>
+		<?php if ( 'post' == get_post_type() && ! is_search() ) : ?>
 			<?php
 				$memberlite_avatar_size = apply_filters( 'memberlite_avatar_size', 80 );
 			?>

diff --git a/search.php b/search.php
@@ -10,10 +10,31 @@
 		<main id="main" class="site-main" role="main">
 		<?php do_action( 'memberlite_before_loop' ); ?>
 		<?php if ( have_posts() ) : ?>
+			<?php
+				/**
+				 * Wrap posts output in the .grid-list class based on settings.
+				 */
+				$content_archives = get_theme_mod( 'content_archives', $memberlite_defaults['content_archives'] );
+				if ( $content_archives === 'grid' ) { ?>
+					<div class="grid-list">
+				<?php }
+			?>
 			<?php while ( have_posts() ) :
 				the_post(); ?>
-				<?php get_template_part( 'components/post/content', get_post_format() ); ?>
+				<?php
+					/**
+					 * Load the grid-style content part based on settings.
+					 */
+					if ( $content_archives === 'grid' ) {
+						get_template_part( 'components/post/content', 'grid' );
+					} else {
+						get_template_part( 'components/post/content', get_post_format() );
+					}
+				?>
 			<?php endwhile; ?>
+			<?php if ( $content_archives === 'grid' ) { ?>
+				</div> <!-- end .grid-list -->
+			<?php } ?>
 			<?php memberlite_paging_nav(); ?>
 		<?php else : ?>
 			<?php get_template_part( 'components/post/content', 'none' ); ?>

diff --git a/style.css b/style.css
@@ -1478,6 +1478,10 @@ a:active {
 	min-height: initial;
 	padding: 5.8rem 0 2.9rem 0;
 }
+.wp-block-cover-image a:not(.has-text-color),
+.wp-block-cover a:not(.has-text-color) {
+	color: inherit;
+}
 .text-center {
 	text-align: center;
 }
@@ -2276,7 +2280,7 @@ a:active {
 	justify-content: flex-start;
 	margin-bottom: 2rem;
 }
-.grid-list article {
+.grid-list > * {
 	background-color: var(--memberlite-color-white);
 	border: 1px solid var(--memberlite-color-borders);
 	display: flex;
@@ -2351,7 +2355,7 @@ a:active {
 	.grid-list {
 		flex-direction: row;
 	}
-	.grid-list article {
+	.grid-list > * {
 		-webkit-box-flex: 0;
 		flex-grow: 0;
 		flex-shrink: 1;
@@ -2362,7 +2366,7 @@ a:active {
 	.grid-list {
 		flex-direction: row;
 	}
-	.grid-list article {
+	.grid-list > * {
 		-webkit-box-flex: 0;
 		flex-grow: 0;
 		flex-shrink: 1;