<!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>[42182] branches/4.9: About Page: Fix issue with overlapping images and text on IE11 and Edge 15.</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 { 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/42182">42182</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/42182","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-11-14 23:03:43 +0000 (Tue, 14 Nov 2017)</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'>About Page: Fix issue with overlapping images and text on IE11 and Edge 15.
Props Clorith, ryelle, afercia, la-geek, SergeyBiryukov.
See <a href="https://core.trac.wordpress.org/ticket/42087">#42087</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/42545">#42545</a> for 4.9</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches49srcwpadminaboutphp">branches/4.9/src/wp-admin/about.php</a></li>
<li><a href="#branches49srcwpadmincssaboutcss">branches/4.9/src/wp-admin/css/about.css</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches49">branches/4.9/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.9
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.9 2017-11-14 23:01:55 UTC (rev 42181)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.9 2017-11-14 23:03:43 UTC (rev 42182)
</ins><a id="branches49"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.9</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.1:18031
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,42132,42134,42136,42138,42140,42144,42146,42148,42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,42132,42134,42136,42138,42140,42144,42146,42148,42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177,42181
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches49srcwpadminaboutphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-admin/about.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-admin/about.php 2017-11-14 23:01:55 UTC (rev 42181)
+++ branches/4.9/src/wp-admin/about.php 2017-11-14 23:03:43 UTC (rev 42182)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,12 +253,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function setup() {
</span><span class="cx" style="display: block; padding: 0 10px"> $sections.each( function( i, section ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var $section = $( section );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Set width on header to prevent column jump
- var $header = $section.find('.section-header');
- $header.css( {
- width: $header.innerWidth() + 'px'
- } );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // If the title is long, switch the layout
</span><span class="cx" style="display: block; padding: 0 10px"> var $title = $section.find( 'h2' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $title.innerWidth() > 300 ) {
</span></span></pre></div>
<a id="branches49srcwpadmincssaboutcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-admin/css/about.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-admin/css/about.css 2017-11-14 23:01:55 UTC (rev 42181)
+++ branches/4.9/src/wp-admin/css/about.css 2017-11-14 23:03:43 UTC (rev 42182)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,8 +260,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .about-wrap .two-col-text {
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-column-count: 2;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -moz-column-count: 2;
</ins><span class="cx" style="display: block; padding: 0 10px"> column-count: 2;
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-column-gap: 40px;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -moz-column-gap: 40px;
</ins><span class="cx" style="display: block; padding: 0 10px"> column-gap: 40px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,52 +370,74 @@
</span><span class="cx" style="display: block; padding: 0 10px"> -ms-grid-column: 1;
</span><span class="cx" style="display: block; padding: 0 10px"> grid-column: 1;
</span><span class="cx" style="display: block; padding: 0 10px"> position: relative;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ min-width: 230px;
+ max-width: 300px;
</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"> .about-wrap .floating-header-section h2 {
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> text-align: left;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ position: absolute;
</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"> .about-wrap .floating-header-section .section-content {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- display: -ms-grid;
- display: grid;
- grid-gap: 60px;
- -ms-grid-columns: 5fr 5fr;
- grid-template-columns: 5fr 5fr;
</del><span class="cx" style="display: block; padding: 0 10px"> -ms-grid-column: 2;
</span><span class="cx" style="display: block; padding: 0 10px"> grid-column: 2;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ display: -webkit-box;
+ display: flex;
+ -webkit-box-pack: justify;
+ justify-content: space-between;
+ -webkit-box-align: start;
+ align-items: flex-start;
+ -webkit-box-orient: horizontal;
+ -webkit-box-direction: normal;
+ flex-flow: row wrap;
+ -webkit-box-flex: 2;
+ flex-grow: 2;
+ flex-shrink: 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.about-wrap .floating-header-section .section-item:nth-of-type(odd) {
- -ms-grid-column: 1;
- grid-column: 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.about-wrap .floating-header-section .section-item {
+ -webkit-box-flex: 1;
+ flex-grow: 1;
+ max-width: calc(50% - 30px);
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.about-wrap .floating-header-section .section-item:nth-of-type(even) {
- -ms-grid-column: 2;
- grid-column: 2;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.about-wrap .floating-header-section .section-item:nth-child(1),
+.about-wrap .floating-header-section .section-item:nth-child(2) {
+ margin-bottom: 60px;
</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">+.about-wrap .floating-header-section .section-item:nth-child(1):nth-last-child(2),
+.about-wrap .floating-header-section .section-item:nth-child(2):nth-last-child(1) {
+ margin-bottom: 0;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .about-wrap .floating-header-section.has-long-title {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- -ms-grid-columns: 1fr;
- grid-template-columns: 1fr;
- grid-gap: 60px 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ display: block;
</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">+.about-wrap .floating-header-section.has-long-title .section-header {
+ max-width: 100%;
+}
+
+.about-wrap .floating-header-section.has-long-title h2 {
+ position: static;
+ margin-bottom: 60px;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .about-wrap .floating-header-section.has-long-title .section-content {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- -ms-grid-columns: minmax(max-content, 300px) minmax(max-content, 300px);
- grid-template-columns: minmax(max-content, 300px) minmax(max-content, 300px);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -webkit-box-pack: start;
+ justify-content: flex-start;
</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"> .about-wrap .floating-header-section.has-long-title .section-item {
</span><span class="cx" style="display: block; padding: 0 10px"> max-width: 300px;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin-bottom: 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.about-wrap .floating-header-section.has-long-title .section-header,
-.about-wrap .floating-header-section.has-long-title .section-content {
- -ms-grid-column: 1;
- grid-column: 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.about-wrap .floating-header-section.has-long-title .section-item + .section-item {
+ margin-left: 60px;
</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"> /*------------------------------------------------------------------------------
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -507,9 +531,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 4.0 - Media Queries
</span><span class="cx" style="display: block; padding: 0 10px"> ------------------------------------------------------------------------------*/
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-@media screen and ( max-width: 782px ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+@media screen and (max-width: 1250px) {
+ .about-wrap .floating-header-section.has-long-title .section-item:nth-child(1),
+ .about-wrap .floating-header-section.has-long-title .section-item:nth-child(2) {
+ margin: 0 0 60px;
+ }
+
+ .about-wrap .floating-header-section.has-long-title .section-item:nth-child(3),
+ .about-wrap .floating-header-section.has-long-title .section-item:nth-child(4) {
+ margin: 0;
+ }
+
+ .about-wrap .floating-header-section.has-long-title .section-item:nth-child(2),
+ .about-wrap .floating-header-section.has-long-title .section-item:nth-child(4) {
+ margin-left: 60px;
+ }
+}
+
+@media screen and (max-width: 782px) {
</ins><span class="cx" style="display: block; padding: 0 10px"> .about-wrap .two-col-text {
</span><span class="cx" style="display: block; padding: 0 10px"> -webkit-column-count: 1;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ -moz-column-count: 1;
</ins><span class="cx" style="display: block; padding: 0 10px"> column-count: 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -524,16 +566,18 @@
</span><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"> .about-wrap .floating-header-section {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- -ms-grid-columns: 1fr;
- grid-template-columns: 1fr;
- grid-gap: 60px 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ display: block;
</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"> .about-wrap .floating-header-section .section-header,
</span><span class="cx" style="display: block; padding: 0 10px"> .about-wrap .floating-header-section .section-content {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- -ms-grid-column: 1;
- grid-column: 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ max-width: 100%;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ .about-wrap .floating-header-section h2 {
+ position: static;
+ margin-bottom: 60px;
+ }
</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"> @media only screen and (max-width: 500px) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -595,15 +639,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> hyphens: auto;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .about-wrap .floating-header-section .section-content {
- -ms-grid-columns: 1fr;
- grid-template-columns: 1fr;
- grid-gap: 60px 0;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> .about-wrap .floating-header-section .section-content .section-item {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- -ms-grid-column: 1;
- grid-column: 1;
</del><span class="cx" style="display: block; padding: 0 10px"> max-width: 100%;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin: 0 0 60px;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>