<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[44263] trunk/src/wp-content/themes/twentysixteen: Twenty Sixteen: Update theme's wide image styles to include Image Blocks</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/44263">44263</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/44263","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-12-17 15:45:05 +0000 (Mon, 17 Dec 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Twenty Sixteen: Update theme's wide image styles to include Image Blocks
Twenty Sixteen includes functionality and styles that make full-size images extend wider than the content when they are added to posts, and appear below the post meta. This update adds the same behavior to image blocks and their captions.
Merges <a href="https://core.trac.wordpress.org/changeset/43911">[43911]</a> to trunk.
Props laurelfulford.
Fixes: <a href="https://core.trac.wordpress.org/ticket/45380">#45380</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentysixteencssblockscss">trunk/src/wp-content/themes/twentysixteen/css/blocks.css</a></li>
<li><a href="#trunksrcwpcontentthemestwentysixteencsseditorblockscss">trunk/src/wp-content/themes/twentysixteen/css/editor-blocks.css</a></li>
<li><a href="#trunksrcwpcontentthemestwentysixteenjsfunctionsjs">trunk/src/wp-content/themes/twentysixteen/js/functions.js</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunk">trunk/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: trunk
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- trunk 2018-12-17 15:35:21 UTC (rev 44262)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk 2018-12-17 15:45:05 UTC (rev 44263)
</ins><a id="trunk"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: trunk</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557,43622
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43912,43915,43919,43926-43929,43954,43956,43961-43963,44014,44017
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43912,43915,43919,43926-43929,43954,43956,43961-43963,44014,44017
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpcontentthemestwentysixteencssblockscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentysixteen/css/blocks.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentysixteen/css/blocks.css 2018-12-17 15:35:21 UTC (rev 44262)
+++ trunk/src/wp-content/themes/twentysixteen/css/blocks.css 2018-12-17 15:45:05 UTC (rev 44263)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,8 +25,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> font-style: italic;
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 1.6153846154;
</span><span class="cx" style="display: block; padding: 0 10px"> padding-top: 0.5384615385em;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ text-align: left;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.rtl [class^="wp-block-"] figcaption {
+ text-align: right;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*--------------------------------------------------------------
</span><span class="cx" style="display: block; padding: 0 10px"> 2.0 Blocks - Common Blocks
</span><span class="cx" style="display: block; padding: 0 10px"> --------------------------------------------------------------*/
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,6 +42,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 5em;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* 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%;
+ }
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Gallery */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-block-gallery {
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentysixteencsseditorblockscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentysixteen/css/editor-blocks.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentysixteen/css/editor-blocks.css 2018-12-17 15:35:21 UTC (rev 44262)
+++ trunk/src/wp-content/themes/twentysixteen/css/editor-blocks.css 2018-12-17 15:45:05 UTC (rev 44263)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,8 +262,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> font-style: italic;
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 1.6153846154;
</span><span class="cx" style="display: block; padding: 0 10px"> padding-top: 0.5384615385em;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ text-align: left;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.rtl [class^="wp-block-"] figcaption {
+ text-align: right;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*--------------------------------------------------------------
</span><span class="cx" style="display: block; padding: 0 10px"> 3.0 Blocks - Common Blocks
</span><span class="cx" style="display: block; padding: 0 10px"> --------------------------------------------------------------*/
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentysixteenjsfunctionsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentysixteen/js/functions.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentysixteen/js/functions.js 2018-12-17 15:35:21 UTC (rev 44262)
+++ trunk/src/wp-content/themes/twentysixteen/js/functions.js 2018-12-17 15:45:05 UTC (rev 44263)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,6 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> entryFooterPos = entryFooter.offset(),
</span><span class="cx" style="display: block; padding: 0 10px"> entryFooterPosBottom = entryFooterPos.top + ( entryFooter.height() + 28 ),
</span><span class="cx" style="display: block; padding: 0 10px"> caption = element.closest( 'figure' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ figcaption = element.next( 'figcaption' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> newImg;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add 'below-entry-meta' to elements below the entry meta.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +155,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( elementPosTop > entryFooterPosBottom ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if full-size images and captions are larger than or equal to 840px.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'img.size-full' === param ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'img.size-full' === param || '.wp-block-image img' === param ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create an image to find native image width of resized images (i.e. max-width: 100%).
</span><span class="cx" style="display: block; padding: 0 10px"> newImg = new Image();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,7 +162,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> newImg.src = element.attr( 'src' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $( newImg ).on( 'load.twentysixteen', function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( newImg.width >= 840 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> element.addClass( 'below-entry-meta' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( caption.hasClass( 'wp-caption' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,6 +175,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> caption.addClass( 'below-entry-meta' );
</span><span class="cx" style="display: block; padding: 0 10px"> caption.removeAttr( 'style' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( figcaption ) {
+ figcaption.addClass( 'below-entry-meta' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,6 +201,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> resizeTimer = setTimeout( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> belowEntryMetaClass( 'img.size-full' );
</span><span class="cx" style="display: block; padding: 0 10px"> belowEntryMetaClass( 'blockquote.alignleft, blockquote.alignright' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ belowEntryMetaClass( '.wp-block-image img' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }, 300 );
</span><span class="cx" style="display: block; padding: 0 10px"> onResizeARIA();
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,5 +208,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> belowEntryMetaClass( 'img.size-full' );
</span><span class="cx" style="display: block; padding: 0 10px"> belowEntryMetaClass( 'blockquote.alignleft, blockquote.alignright' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ belowEntryMetaClass( '.wp-block-image img' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> } )( jQuery );
</span></span></pre>
</div>
</div>
</body>
</html>