<!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>[27578] trunk/src/wp-includes: TinyMCE:</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27578">27578</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-03-18 00:19:17 +0000 (Tue, 18 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE:
- Update the styling of the image caption and gallery toolbars.
- Fix issue where the hidden clipboard div in wpView.
- Switch to using the pencil dashicon for Edit.
- Add `max-width: 100%;` to images in the gallery preview and adjust column widths.
Props cramdesign, mattheu, gcorne, melchoyce, see <a href="http://core.trac.wordpress.org/ticket/27320">#27320</a>, fixes <a href="http://core.trac.wordpress.org/ticket/27376">#27376</a>, fixes <a href="http://core.trac.wordpress.org/ticket/27354">#27354</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjstinymcepluginswpeditimagepluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymceskinswordpresswpcontentcss">trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjstinymcepluginswpeditimagepluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js (27577 => 27578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-03-18 00:16:35 UTC (rev 27577)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-03-18 00:19:17 UTC (rev 27578)
</span><span class="lines">@@ -348,9 +348,8 @@
</span><span class="cx"> dom.setAttrib( node, 'data-wp-imgselect', 1 );
</span><span class="cx"> position = dom.getPos( node, editor.getBody() );
</span><span class="cx">
</span><del>- toolbarHtml = '<div class="wrapper" data-mce-bogus="1">' +
- '<div class="dashicons dashicons-format-image edit" data-mce-bogus="1"></div> ' +
- '<div class="dashicons dashicons-no-alt remove" data-mce-bogus="1"></div></div>';
</del><ins>+ toolbarHtml = '<div class="dashicons dashicons-edit edit" data-mce-bogus="1"></div> ' +
+ '<div class="dashicons dashicons-no-alt remove" data-mce-bogus="1"></div>';
</ins><span class="cx">
</span><span class="cx"> toolbar = dom.create( 'div', {
</span><span class="cx"> 'id': 'wp-image-toolbar',
</span><span class="lines">@@ -362,8 +361,7 @@
</span><span class="cx">
</span><span class="cx"> dom.setStyles( toolbar, {
</span><span class="cx"> top: position.y,
</span><del>- left: position.x,
- width: node.width
</del><ins>+ left: position.x
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymceskinswordpresswpcontentcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css (27577 => 27578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-03-18 00:16:35 UTC (rev 27577)
+++ trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-03-18 00:19:17 UTC (rev 27578)
</span><span class="lines">@@ -160,34 +160,14 @@
</span><span class="cx">
</span><span class="cx"> #wp-image-toolbar {
</span><span class="cx"> position: absolute;
</span><ins>+ background-color: #333;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#wp-image-toolbar .wrapper {
- position: relative;
- height: 33px;
- background-color: #333; /* old IE */
- background-color: rgba(0,0,0,0.3);
-}
-
</del><span class="cx"> #wp-image-toolbar .dashicons {
</span><del>- position: absolute;
</del><span class="cx"> color: white;
</span><del>- width: 36px;
- height: 32px;
- line-height: 32px;
</del><span class="cx"> cursor: pointer;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#wp-image-toolbar div.dashicons-no-alt {
- top: 0;
- right: 0;
-}
-
-#wp-image-toolbar div.dashicons-format-image {
- top: 0;
- left: 0;
-}
-
</del><span class="cx"> /* Image resize handles */
</span><span class="cx"> .mce-content-body div.mce-resizehandle {
</span><span class="cx"> border-color: #777;
</span><span class="lines">@@ -239,6 +219,7 @@
</span><span class="cx"> clip: rect(1px, 1px, 1px, 1px);
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> outline: 0;
</span><ins>+ width: 100%;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -246,21 +227,19 @@
</span><span class="cx"> */
</span><span class="cx"> .wpview-type-gallery {
</span><span class="cx"> position: relative;
</span><del>- padding: 0 0 12px;
</del><span class="cx"> margin-bottom: 16px;
</span><span class="cx"> cursor: pointer;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .wpview-type-gallery:after {
</span><span class="cx"> content: '';
</span><del>- display: block;
- height: 0;
</del><ins>+ display: table;
</ins><span class="cx"> clear: both;
</span><del>- visibility: hidden;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .wpview-type-gallery.selected {
</span><del>- background-color: #efefef;
</del><ins>+ background-color: #f2f8ff;
+ outline: 1px solid #777;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .wpview-type-gallery .toolbar {
</span><span class="lines">@@ -269,10 +248,14 @@
</span><span class="cx"> left: 0;
</span><span class="cx"> background-color: #333;
</span><span class="cx"> color: white;
</span><del>- padding: 4px;
</del><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.wpview-type-gallery .toolbar div,
+#wp-image-toolbar div {
+ margin: 5px;
+}
+
</ins><span class="cx"> .wpview-type-gallery.selected .toolbar {
</span><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="lines">@@ -291,13 +274,21 @@
</span><span class="cx">
</span><span class="cx"> .gallery {
</span><span class="cx"> margin: auto;
</span><del>- line-height: 1;
</del><ins>+ padding: 0.5em 0;
+ line-height: 1;
+ margin-left: -0.5em;
+ margin-right: -0.5em;
+ overflow-x: hidden;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gallery .gallery-item {
</span><span class="cx"> float: left;
</span><del>- margin: 10px 0 0 0;
</del><ins>+ margin: 0;
</ins><span class="cx"> text-align: center;
</span><ins>+ padding: 0.5em;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gallery .gallery-caption,
</span><span class="lines">@@ -305,44 +296,51 @@
</span><span class="cx"> margin: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.gallery .gallery-caption {
+ font-size: 13px;
+ margin: 4px 0;
+}
+
</ins><span class="cx"> .gallery-columns-1 .gallery-item {
</span><del>- width: 99%;
</del><ins>+ width: 100%;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gallery-columns-2 .gallery-item {
</span><del>- width: 49.5%;
</del><ins>+ width: 50%;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gallery-columns-3 .gallery-item {
</span><del>- width: 33%;
</del><ins>+ width: 33.333%;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gallery-columns-4 .gallery-item {
</span><del>- width: 24.75%;
</del><ins>+ width: 25%;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gallery-columns-5 .gallery-item {
</span><del>- width: 19.825%;
</del><ins>+ width: 20%;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gallery-columns-6 .gallery-item {
</span><del>- width: 16%;
</del><ins>+ width: 16.667%;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gallery-columns-7 .gallery-item {
</span><del>- width: 14%;
</del><ins>+ width: 14.285%;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gallery-columns-8 .gallery-item {
</span><del>- width: 12%;
</del><ins>+ width: 12.5%;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gallery-columns-9 .gallery-item {
</span><del>- width: 11%;
</del><ins>+ width: 11.111%;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gallery img {
</span><span class="cx"> border: 1px solid #cfcfcf;
</span><ins>+ max-width: 100%;
+ height: auto;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> img.wp-oembed {
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (27577 => 27578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-03-18 00:16:35 UTC (rev 27577)
+++ trunk/src/wp-includes/media-template.php 2014-03-18 00:19:17 UTC (rev 27578)
</span><span class="lines">@@ -905,7 +905,7 @@
</span><span class="cx">
</span><span class="cx"> <script type="text/html" id="tmpl-editor-gallery">
</span><span class="cx"> <div class="toolbar">
</span><del>- <div class="dashicons dashicons-format-gallery edit"></div>
</del><ins>+ <div class="dashicons dashicons-edit edit"></div>
</ins><span class="cx"> <div class="dashicons dashicons-no-alt remove"></div>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="gallery gallery-columns-{{{ data.columns }}}">
</span></span></pre>
</div>
</div>
</body>
</html>