Plugin Issue #864: Remove <amp-img> workaround filters.

assets/src/css/components/_entry--featured.scss

@@ -36,6 +36,10 @@
 			width: 100%;
 			margin: -10px 0 0;
 		}
+
+		.wp-post-image {
+			padding-bottom: 38%;
+		}
 	}
 
 	//

assets/src/css/components/_entry.scss

@@ -14,6 +14,16 @@
 	&__thumbnail {
 		margin: 0;
 		padding: 0;
+
+		.wp-post-image {
+			position: relative;
+			width: 100%;
+			padding-bottom: 66%;
+		}
+
+		img {
+			object-fit: cover;
+		}
 	}
 
 	//

assets/src/css/components/_site-header.scss

@@ -97,10 +97,25 @@
 			width: 100%;
 			max-width: 400px;
 			height: 100%;
+			background-repeat: no-repeat;
+			background-position: left center;
+			background-size: contain;
+
+			@media ( query( min, tablet ) ) {
+				height: auto;
+			}
 		}
 
 		.custom-logo {
-			max-width: 100%;
+			max-height: 100%;
+
+			@media ( query( min, tablet ) ) {
+				display: block;
+			}
+
+			img {
+				object-fit: contain;
+			}
 		}
 	}
 

inc/template-functions.php

@@ -68,45 +68,3 @@ function ampconf_get_the_archive_title( $title ) {
 	return $title;
 }
 add_filter( 'get_the_archive_title', 'ampconf_get_the_archive_title' );
-
-/**
- * Filter the featured image for AMP.
- *
- * There is a problem with the AMP sanitizer that is not properly converting img into amp-img,
- * so this is a workaround to preempt the sanitizer.
- *
- * @see get_the_post_thumbnail()
- *
- * @param string $html The post thumbnail HTML.
- * @return string Amplified HTML.
- */
-function ampconf_filter_post_thumbnail_html( $html ) {
-	if ( is_amp_endpoint() ) {
-		$html = str_replace( '<img ', '<amp-img ', $html ) . '</amp-img>';
-	}
-	return $html;
-}
-if ( function_exists( 'is_amp_endpoint' ) ) {
-	add_filter( 'post_thumbnail_html', 'ampconf_filter_post_thumbnail_html' );
-}
-
-/**
- * Filter the custom logo image for AMP.
- *
- * There is a problem with the AMP sanitizer that is not properly converting img into amp-img,
- * so this is a workaround to preempt the sanitizer.
- *
- * @see get_custom_logo()
- *
- * @param string $html The custom logo HTML.
- * @return string Amplified HTML.
- */
-function ampconf_filter_get_custom_logo( $html ) {
-	if ( is_amp_endpoint() ) {
-		$html = str_replace( '<img ', '<amp-img ', $html ) . '</amp-img>';
-	}
-	return $html;
-}
-if ( function_exists( 'is_amp_endpoint' ) ) {
-	add_filter( 'get_custom_logo', 'ampconf_filter_get_custom_logo' );
-}

templates/entry/default.php

@@ -10,7 +10,7 @@
 	<?php if ( has_post_thumbnail() ) : ?>
 		<figure class="entry__thumbnail">
 			<a href="<?php the_permalink(); ?>">
-				<?php the_post_thumbnail( 'ampconf-768x432' ); ?>
+				<?php the_post_thumbnail( 'ampconf-768x432', array( 'data-amp-layout' => 'fill' ) ); ?>
 			</a>
 		</figure><!-- .entry__thumbnail -->
 	<?php endif; ?>

templates/entry/featured.php

@@ -10,7 +10,7 @@
 	<?php if ( has_post_thumbnail() ) : ?>
 		<figure class="entry__thumbnail">
 			<a href="<?php the_permalink(); ?>">
-				<?php the_post_thumbnail( 'ampconf-1040x585' ); ?>
+				<?php the_post_thumbnail( 'ampconf-1040x585', array( 'data-amp-layout' => 'fill' ) ); ?>
 			</a>
 		</figure><!-- .entry__thumbnail -->
 	<?php endif; ?>

templates/entry/full-page.php

@@ -10,7 +10,7 @@
 	<?php if ( has_post_thumbnail() ) : ?>
 		<figure class="entry__thumbnail">
 			<a href="<?php the_permalink(); ?>">
-				<?php the_post_thumbnail( 'ampconf-1040x585' ); ?>
+				<?php the_post_thumbnail( 'ampconf-1040x585', array( 'data-amp-layout' => 'fill' ) ); ?>
 			</a>
 		</figure><!-- .entry__thumbnail -->
 	<?php endif; ?>

templates/entry/full.php

@@ -10,7 +10,7 @@
 	<?php if ( has_post_thumbnail() ) : ?>
 		<figure class="entry__thumbnail">
 			<a href="<?php the_permalink(); ?>">
-				<?php the_post_thumbnail( 'ampconf-1040x585' ); ?>
+				<?php the_post_thumbnail( 'ampconf-1040x585', array( 'data-amp-layout' => 'fill' ) ); ?>
 			</a>
 		</figure><!-- .entry__thumbnail -->
 	<?php endif; ?>

templates/entry/slim.php

@@ -10,7 +10,7 @@
 	<?php if ( has_post_thumbnail() ) : ?>
 		<figure class="entry__thumbnail">
 			<a href="<?php the_permalink(); ?>">
-				<?php the_post_thumbnail( 'ampconf-280x158' ); ?>
+				<?php the_post_thumbnail( 'ampconf-280x158', array( 'data-amp-layout' => 'fill' ) ); ?>
 			</a>
 		</figure><!-- .entry__thumbnail -->
 	<?php endif; ?>