<!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>[46355] trunk/src/wp-includes/css/editor.css: Media: Revert [46354] preventing bad clipping of text in image details page.</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/46355">46355</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/46355","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>antpb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-09-30 17:11:14 +0000 (Mon, 30 Sep 2019)</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'>Media: Revert <a href="https://core.trac.wordpress.org/changeset/46354">[46354]</a> preventing bad clipping of text in image details page.
See <a href="https://core.trac.wordpress.org/ticket/47115">#47115</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueueslibimageeditjs">trunk/src/js/_enqueues/lib/image-edit.js</a></li>
<li><a href="#trunksrcjsmediaviewsframeselectjs">trunk/src/js/media/views/frame/select.js</a></li>
<li><a href="#trunksrcwpadmincsseditcss">trunk/src/wp-admin/css/edit.css</a></li>
<li><a href="#trunksrcwpadmincssmediacss">trunk/src/wp-admin/css/media.css</a></li>
<li><a href="#trunksrcwpadminincludesimageeditphp">trunk/src/wp-admin/includes/image-edit.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpincludescsseditorcss">trunk/src/wp-includes/css/editor.css</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunksrcwpadminprivacyphp">trunk/src/wp-admin/privacy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueueslibimageeditjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/image-edit.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/image-edit.js 2019-09-30 16:33:39 UTC (rev 46354)
+++ trunk/src/js/_enqueues/lib/image-edit.js 2019-09-30 17:11:14 UTC (rev 46355)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -503,7 +503,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If a response is returned, close the editor and show an error.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ret.error ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('#imgedit-response-' + postid).html('<div class="error" role="alert"><p>' + ret.error + '</p></div>');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $('#imgedit-response-' + postid).html('<div class="error"><p>' + ret.error + '</p></div>');
</ins><span class="cx" style="display: block; padding: 0 10px"> imageEdit.close(postid);
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -517,7 +517,7 @@
</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"> if ( ret.msg ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('#imgedit-response-' + postid).html('<div class="updated" role="alert"><p>' + ret.msg + '</p></div>');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $('#imgedit-response-' + postid).html('<div class="updated"><p>' + ret.msg + '</p></div>');
</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"> if ( self._view ) {
</span></span></pre></div>
<a id="trunksrcjsmediaviewsframeselectjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/frame/select.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/frame/select.js 2019-09-30 16:33:39 UTC (rev 46354)
+++ trunk/src/js/media/views/frame/select.js 2019-09-30 17:11:14 UTC (rev 46355)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,8 +62,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Create the default states on the frame.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> createStates: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- console.log("test");
- this.on( 'content:render:edit-image', this.editState, this );
</del><span class="cx" style="display: block; padding: 0 10px"> var options = this.options;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( this.options.states ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,8 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> multiple: options.multiple,
</span><span class="cx" style="display: block; padding: 0 10px"> title: options.title,
</span><span class="cx" style="display: block; padding: 0 10px"> priority: 20
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }),
- new wp.media.controller.EditImage( { model: this.options.editImage } ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ })
</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></pre></div>
<a id="trunksrcwpadmincsseditcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/edit.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/edit.css 2019-09-30 16:33:39 UTC (rev 46354)
+++ trunk/src/wp-admin/css/edit.css 2019-09-30 17:11:14 UTC (rev 46355)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -655,12 +655,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 20px;
</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">-.wp_attachment_details .attachment-content-description {
- margin-top: 0.5385em;
- display: inline-block;
- min-height: 1.6923em;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> /* Suggested text for privacy policy */
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-privacy-policy-guide {
</span><span class="cx" style="display: block; padding: 0 10px"> max-width: 1000px;
</span></span></pre></div>
<a id="trunksrcwpadmincssmediacss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/media.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/media.css 2019-09-30 16:33:39 UTC (rev 46354)
+++ trunk/src/wp-admin/css/media.css 2019-09-30 17:11:14 UTC (rev 46355)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -800,11 +800,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 5px;
</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">-.attachment-details .setting + .description a:focus {
- /* Only visible in Windows High Contrast mode */
- outline: 1px solid transparent;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .wp_attachment_details .attachment-alt-text-description {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-top: 5px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1119,14 +1114,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 10px;
</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">-.imgedit-settings .imgedit-original-dimensions {
- display: inline-block;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .imgedit-settings .imgedit-scale input[type="text"],
</span><span class="cx" style="display: block; padding: 0 10px"> .imgedit-settings .imgedit-crop-ratio input[type="text"],
</span><span class="cx" style="display: block; padding: 0 10px"> .imgedit-settings .imgedit-crop-sel input[type="text"] {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- width: 80px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ width: 50px;
</ins><span class="cx" style="display: block; padding: 0 10px"> font-size: 14px;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 5px 8px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1139,11 +1130,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> color: #444;
</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">-.imgedit-settings .imgedit-scale-button-wrapper {
- margin-top: 0.3077em;
- display: block;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .imgedit-settings .imgedit-scale .button {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesimageeditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/image-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image-edit.php 2019-09-30 16:33:39 UTC (rev 46354)
+++ trunk/src/wp-admin/includes/image-edit.php 2019-09-30 17:11:14 UTC (rev 46355)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,9 +38,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $msg ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $msg->error ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $note = "<div class='error' tabindex='-1' role='alert'><p>$msg->error</p></div>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $note = "<div class='error'><p>$msg->error</p></div>";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $msg->msg ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $note = "<div class='updated' tabindex='-1' role='alert'><p>$msg->msg</p></div>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $note = "<div class='updated'><p>$msg->msg</p></div>";
</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">@@ -62,7 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Image width and height in pixels. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Original dimensions %s' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<span class="imgedit-original-dimensions">' . $meta['width'] . ' × ' . $meta['height'] . '</span>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta['width'] . ' × ' . $meta['height']
</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"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,7 +78,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="imgedit-scale-height-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'scale height' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="imgedit-scale-warn" id="imgedit-scale-warn-<?php echo $post_id; ?>">!</span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="imgedit-scale-button-wrapper"><input id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" /></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,7 +235,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="imgedit-crop-<?php echo $post_id; ?>" class="imgedit-crop-wrap">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <img id="image-preview-<?php echo $post_id; ?>" src="<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>?action=imgedit-preview&_ajax_nonce=<?php echo $nonce; ?>&postid=<?php echo $post_id; ?>&rand=<?php echo rand( 1, 99999 ); ?>" alt="" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')" src="<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>?action=imgedit-preview&_ajax_nonce=<?php echo $nonce; ?>&postid=<?php echo $post_id; ?>&rand=<?php echo rand( 1, 99999 ); ?>" alt="" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="imgedit-submit">
</span></span></pre></div>
<a id="trunksrcwpadminincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2019-09-30 16:33:39 UTC (rev 46354)
+++ trunk/src/wp-admin/includes/media.php 2019-09-30 17:11:14 UTC (rev 46355)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3207,7 +3207,7 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="attachment_content" class="attachment-content-description"><strong><?php _e( 'Description' ); ?></strong>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="attachment_content"><strong><?php _e( 'Description' ); ?></strong>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">Index: trunk/src/wp-admin/privacy.php
</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/src/wp-admin/privacy.php 2019-09-30 16:33:39 UTC (rev 46354)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk/src/wp-admin/privacy.php 2019-09-30 17:11:14 UTC (rev 46355)
</ins></span></pre></div>
<a id="trunksrcwpadminprivacyphp"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: trunk/src/wp-admin/privacy.php</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: svn:mergeinfo</h4></div>
<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/branches/3.1/src/wp-admin/privacy.php:18031
-/branches/3.3/src/wp-admin/privacy.php:20543
-/branches/3.4/src/wp-admin/privacy.php:21757
-/branches/4.9/src/wp-admin/privacy.php:43557,43622
-/branches/5.0/src/wp-admin/privacy.php:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludescsseditorcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/css/editor.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/css/editor.css 2019-09-30 16:33:39 UTC (rev 46354)
+++ trunk/src/wp-includes/css/editor.css 2019-09-30 17:11:14 UTC (rev 46355)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1322,7 +1322,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-core-ui .quicktags-toolbar input.button.button-small {
</span><span class="cx" style="display: block; padding: 0 10px"> /* .button-small is normally 11px, but a bit too small for these buttons. */
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 12px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- min-height: 26px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ height: 26px;
</ins><span class="cx" style="display: block; padding: 0 10px"> line-height: 2;
</span><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>