Merge branch 'bugfix/characters' into development

LezWatch · Mar 27, 2024 · 4bbc3cc · 4bbc3cc
2 parents 0207174 + bbd78cd
commit 4bbc3cc
Show file tree

Hide file tree

Showing 38 changed files with 1,108 additions and 775 deletions.
diff --git a/archive-post_type_actors.php b/archive-post_type_actors.php
@@ -58,7 +58,7 @@
 									/* Start the Loop */
 									while ( have_posts() ) :
 										the_post();
-										get_template_part( 'template-parts/excerpt', 'post_type_actors' );
+										get_template_part( 'template-parts/excerpt', 'post_type_actors', array( 'actor' => get_the_ID() ) );
 									endwhile;
 								} else {
 									get_template_part( 'template-parts/content', 'none' );

diff --git a/archive-post_type_characters.php b/archive-post_type_characters.php
@@ -59,7 +59,7 @@
 										/* Start the Loop */
 										while ( have_posts() ) {
 											the_post();
-											get_template_part( 'template-parts/excerpt', 'post_type_characters' );
+											get_template_part( 'template-parts/excerpt', 'post_type_characters', array( 'character' => get_the_ID() ) );
 										}
 									} else {
 										get_template_part( 'template-parts/content', 'none' );

diff --git a/functions.php b/functions.php
@@ -103,13 +103,17 @@ function lwtv_custom_excerpt_length( $length ) {
 /*
  * Custom Image Sizes
  *
- * character-img - used on show and character pages
- * show-img - used as header image for shows
+ * character-img   - Used on show and character pages
+ * show-img        - Used as header image for shows
+ * postloop-img    - Used in the post loop
+ * relatedshow-img - Used in the related shows section
+ * headshot-tiny   - Used on relationships lists
  */
 add_image_size( 'character-img', 350, 412, true );
 add_image_size( 'show-img', 960, 400, true );
 add_image_size( 'postloop-img', 525, 300, true );
 add_image_size( 'relatedshow-img', 340, 150, true );
+add_image_size( 'headshot-tiny', 50, 50, true );
 
 /**
  * Comments

diff --git a/header.php b/header.php
@@ -13,35 +13,7 @@
 <link rel="profile" href="http://gmpg.org/xfn/11">
 <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>">
 
-<?php
-if ( is_front_page() ) {
-	?>
-	<!-- Preload the LCP images with a high fetchpriority so it starts loading with the stylesheet. -->
-	<?php
-	$image = wp_get_attachment_image_src( get_theme_mod( 'custom_logo' ), 'full' );
-
-	if ( has_header_image() ) {
-		$header_image = get_header_image();
-
-		if ( str_ends_with( $header_image, 'webp' ) ) {
-			$image_type = 'webp';
-		} elseif ( str_ends_with( $header_image, 'png' ) ) {
-			$image_type = 'png';
-		} else {
-			$image_type = 'jpeg';
-		}
-		?>
-		<link rel="preload" fetchpriority="high" as="image" href="<?php echo esc_url( $header_image ); ?>" type="image/<?php echo esc_attr( $image_type ); ?>">
-		<?php
-	}
-
-	if ( false !== $image ) {
-		?>
-		<link rel="preload" fetchpriority="high" as="image" href="<?php echo esc_url( $image[0] ); ?>" type="image/png">
-		<?php
-	}
-}
-?>
+<?php get_template_part( 'template-parts/header', 'lcp', array( 'post_id' => get_the_ID() ) ); ?>
 
 <?php wp_head(); ?>
 </head>

diff --git a/sidebar.php b/sidebar.php
@@ -33,7 +33,7 @@
 			case 'post_type_actors':
 			case 'post_type_characters':
 			case 'post_type_shows':
-				get_template_part( 'template-parts/sidebar', get_post_type() );
+				get_template_part( 'template-parts/sidebar', get_post_type(), array( 'the_post_id' => get_the_ID() ) );
 				break;
 			default:
 				dynamic_sidebar( 'sidebar-2' );

diff --git a/style.css b/style.css
diff --git a/style.css.map b/style.css.map
diff --git a/style.min.css b/style.min.css
diff --git a/style.scss b/style.scss
@@ -1180,6 +1180,18 @@ table.lwtvc {
 				padding: 0;
 			}
 		}
+
+		#characterActors.accordion, #characterShows.accordion {
+			--bs-accordion-btn-focus-box-shadow: 0 0 0 0.2rem $lwtv-grey2;
+			button {
+				font-family: "Open Sans", sans-serif;
+				font-size: $basefont;
+				padding: .2rem 0;
+			}
+			.accordion-button:not(.collapsed) {
+				background-color: $lwtv-grey2;
+			}
+		}
 	}
 }
 

diff --git a/taxonomy.php b/taxonomy.php
@@ -82,7 +82,7 @@
 											the_post();
 											switch ( get_post_type( get_the_ID() ) ) {
 												case 'post_type_characters':
-													get_template_part( 'template-parts/excerpt', 'post_type_characters' );
+													get_template_part( 'template-parts/excerpt', 'post_type_characters', array( 'character' => get_the_ID() ) );
 													break;
 												case 'post_type_shows':
 													get_template_part( 'template-parts/excerpt', 'post_type_shows' );