Twenty Nineteen: Display Image block at the same size whether the image is linked or not.

This change makes sure the `max-width` value is assigned for linked images.

Props JarretC, sabernhardt.
Fixes #48697.

Built from https://develop.svn.wordpress.org/trunk@52927


git-svn-id: http://core.svn.wordpress.org/trunk@52516 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-content/themes/twentynineteen/sass/blocks/_blocks.scss

@@ -546,10 +546,13 @@
 		}
 
 		// If an image does not have a left/center/right alignment, 
-		// it's a direct child of .wp-block-img.  If it has no other 
+		// it's a direct child of .wp-block-image.  If it has no other 
-		// alignment added, we want to make sure the image does not 
+		// alignment added, we want to make sure the image and its 
-		// extend beyond the width of the text column.
+		// caption do not extend beyond the width of the text column.
-		&:not(.alignwide):not(.alignfull) > img {
+		&:not(.alignwide):not(.alignfull) > img,
+		&:not(.alignwide):not(.alignfull) > a > img,
+		&:not(.alignwide):not(.alignfull) > img + figcaption,
+		&:not(.alignwide):not(.alignfull) > a + figcaption {
 			@include postContentMaxWidth();
 		}
 
@@ -803,6 +806,8 @@
 		}
 
 		// Ensure images do not expand beyond the column.
+		.wp-block-image:not(.alignwide):not(.alignfull) > img,
+		.wp-block-image:not(.alignwide):not(.alignfull) > a > img,
 		.wp-block-image > img:not(.alignwide):not(.alignfull),
 		.wp-block-image > figure {
 

wp-content/themes/twentynineteen/style-rtl.css

@@ -5847,13 +5847,19 @@ body.page .main-navigation {
 }
 
 @media only screen and (min-width: 768px) {
-  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > img {
+  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > img,
+  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > a > img,
+  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > img + figcaption,
+  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > a + figcaption {
     max-width: calc(8 * (100vw / 12) - 28px);
   }
 }
 
 @media only screen and (min-width: 1168px) {
-  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > img {
+  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > img,
+  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > a > img,
+  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > img + figcaption,
+  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > a + figcaption {
     max-width: calc(6 * (100vw / 12) - 28px);
   }
 }
@@ -6181,6 +6187,8 @@ body.page .main-navigation {
 }
 
 @media only screen and (min-width: 768px) {
+  .entry .entry-content .wp-block-columns .wp-block-image:not(.alignwide):not(.alignfull) > img,
+  .entry .entry-content .wp-block-columns .wp-block-image:not(.alignwide):not(.alignfull) > a > img,
   .entry .entry-content .wp-block-columns .wp-block-image > img:not(.alignwide):not(.alignfull),
   .entry .entry-content .wp-block-columns .wp-block-image > figure {
     max-width: 100%;
@@ -6188,6 +6196,8 @@ body.page .main-navigation {
 }
 
 @media only screen and (min-width: 1168px) {
+  .entry .entry-content .wp-block-columns .wp-block-image:not(.alignwide):not(.alignfull) > img,
+  .entry .entry-content .wp-block-columns .wp-block-image:not(.alignwide):not(.alignfull) > a > img,
   .entry .entry-content .wp-block-columns .wp-block-image > img:not(.alignwide):not(.alignfull),
   .entry .entry-content .wp-block-columns .wp-block-image > figure {
     max-width: 100%;

wp-content/themes/twentynineteen/style.css

@@ -5859,13 +5859,19 @@ body.page .main-navigation {
 }
 
 @media only screen and (min-width: 768px) {
-  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > img {
+  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > img,
+  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > a > img,
+  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > img + figcaption,
+  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > a + figcaption {
     max-width: calc(8 * (100vw / 12) - 28px);
   }
 }
 
 @media only screen and (min-width: 1168px) {
-  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > img {
+  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > img,
+  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > a > img,
+  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > img + figcaption,
+  .entry .entry-content .wp-block-image:not(.alignwide):not(.alignfull) > a + figcaption {
     max-width: calc(6 * (100vw / 12) - 28px);
   }
 }
@@ -6193,6 +6199,8 @@ body.page .main-navigation {
 }
 
 @media only screen and (min-width: 768px) {
+  .entry .entry-content .wp-block-columns .wp-block-image:not(.alignwide):not(.alignfull) > img,
+  .entry .entry-content .wp-block-columns .wp-block-image:not(.alignwide):not(.alignfull) > a > img,
   .entry .entry-content .wp-block-columns .wp-block-image > img:not(.alignwide):not(.alignfull),
   .entry .entry-content .wp-block-columns .wp-block-image > figure {
     max-width: 100%;
@@ -6200,6 +6208,8 @@ body.page .main-navigation {
 }
 
 @media only screen and (min-width: 1168px) {
+  .entry .entry-content .wp-block-columns .wp-block-image:not(.alignwide):not(.alignfull) > img,
+  .entry .entry-content .wp-block-columns .wp-block-image:not(.alignwide):not(.alignfull) > a > img,
   .entry .entry-content .wp-block-columns .wp-block-image > img:not(.alignwide):not(.alignfull),
   .entry .entry-content .wp-block-columns .wp-block-image > figure {
     max-width: 100%;

wp-includes/version.php

@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.0-alpha-52926';
+$wp_version = '6.0-alpha-52927';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.