Ticket #45380: 45380.patch

src/wp-content/themes/twentysixteen/css/blocks.css

@@ -25 +25 @@
         font-style: italic;
         line-height: 1.6153846154;
         padding-top: 0.5384615385em;
+        text-align: left;
 }
 
+.rtl [class^="wp-block-"] figcaption {
+        text-align: right;
+}
+
 /*--------------------------------------------------------------
 2.0 Blocks - Common Blocks
 --------------------------------------------------------------*/
@@ -37 +42 @@
         font-size: 5em;
 }
 
+/* Image */
+
+@media screen and (min-width: 61.5625em) {
+        body:not(.search-results) article:not(.type-page) .wp-block-image figcaption.below-entry-meta {
+                clear: both;
+                display: block;
+                float: none;
+                margin-right: 0;
+                margin-left: -40%;
+                max-width: 140%;
+        }
+
+        body.rtl:not(.search-results) article:not(.type-page) .wp-block-image figcaption.below-entry-meta {
+                margin-left: 0;
+                margin-right: -40%;
+        }
+}
+
 /* Gallery */
 
 .wp-block-gallery {

src/wp-content/themes/twentysixteen/css/editor-blocks.css

@@ -262 +262 @@
         font-style: italic;
         line-height: 1.6153846154;
         padding-top: 0.5384615385em;
+        text-align: left;
 }
 
+.rtl [class^="wp-block-"] figcaption {
+        text-align: right;
+}
+
 /*--------------------------------------------------------------
 3.0 Blocks - Common Blocks
 --------------------------------------------------------------*/

src/wp-content/themes/twentysixteen/js/functions.js

@@ -148 +148 @@
                                 entryFooterPos       = entryFooter.offset(),
                                 entryFooterPosBottom = entryFooterPos.top + ( entryFooter.height() + 28 ),
                                 caption              = element.closest( 'figure' ),
+                                figcaption           = element.next( 'figcaption' ),
                                 newImg;
 
                         // Add 'below-entry-meta' to elements below the entry meta.
@@ -154 +155 @@
                         if ( elementPosTop > entryFooterPosBottom ) {
 
                                 // Check if full-size images and captions are larger than or equal to 840px.
-                                if ( 'img.size-full' === param ) {
+                                if ( 'img.size-full' === param || '.wp-block-image img' === param ) {
 
                                         // Create an image to find native image width of resized images (i.e. max-width: 100%).
                                         newImg = new Image();
@@ -161 +162 @@
                                         newImg.src = element.attr( 'src' );
 
                                         $( newImg ).on( 'load.twentysixteen', function() {
-                                                if ( newImg.width >= 840  ) {
+                                                if ( newImg.width >= 840 ) {
+
+                                                        // Check if an image in an image block has a width attribute; if its value is less than 840, return.
+                                                        if ( '.wp-block-image img' === param && element.is( '[width]' ) && element.attr( 'width' ) < 840 ) {
+                                                                return;
+                                                        }
+
                                                         element.addClass( 'below-entry-meta' );
 
                                                         if ( caption.hasClass( 'wp-caption' ) ) {
@@ -168 +175 @@
                                                                 caption.addClass( 'below-entry-meta' );
                                                                 caption.removeAttr( 'style' );
                                                         }
+
+                                                        if ( figcaption ) {
+                                                                figcaption.addClass( 'below-entry-meta' );
+                                                        }
                                                 }
                                         } );
                                 } else {
@@ -190 +201 @@
                                 resizeTimer = setTimeout( function() {
                                         belowEntryMetaClass( 'img.size-full' );
                                         belowEntryMetaClass( 'blockquote.alignleft, blockquote.alignright' );
+                                        belowEntryMetaClass( '.wp-block-image img' );
                                 }, 300 );
                                 onResizeARIA();
                         } );
@@ -196 +208 @@
 
                 belowEntryMetaClass( 'img.size-full' );
                 belowEntryMetaClass( 'blockquote.alignleft, blockquote.alignright' );
+                belowEntryMetaClass( '.wp-block-image img' );
         } );
 } )( jQuery );