<!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>[27628] trunk/src/wp-includes: Further unify and refine media and view control styling.</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/27628">27628</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-03-20 00:47:21 +0000 (Thu, 20 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Further unify and refine media and view control styling. see <a href="http://core.trac.wordpress.org/ticket/27320">#27320</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>
<li><a href="#trunksrcwpincludesversionphp">trunk/src/wp-includes/version.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 (27627 => 27628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-03-19 23:07:24 UTC (rev 27627)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-03-20 00:47:21 UTC (rev 27628)
</span><span class="lines">@@ -348,7 +348,7 @@
</span><span class="cx"> dom.setAttrib( node, 'data-wp-imgselect', 1 );
</span><span class="cx"> rectangle = dom.getRect( node );
</span><span class="cx">
</span><del>- toolbarHtml = '<div class="dashicons dashicons-edit edit" data-mce-bogus="1"></div> ' +
</del><ins>+ toolbarHtml = '<div class="dashicons dashicons-edit edit" data-mce-bogus="1"></div>' +
</ins><span class="cx"> '<div class="dashicons dashicons-no-alt remove" data-mce-bogus="1"></div>';
</span><span class="cx">
</span><span class="cx"> toolbar = dom.create( 'div', {
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymceskinswordpresswpcontentcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css (27627 => 27628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-03-19 23:07:24 UTC (rev 27627)
+++ trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css 2014-03-20 00:47:21 UTC (rev 27628)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> border-top: 3px dotted #bbb;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* Gallery, audio, vudeo placeholders */
</del><ins>+/* Gallery, audio, video placeholders */
</ins><span class="cx"> .mce-content-body img.wp-media {
</span><span class="cx"> border: 1px solid #aaa;
</span><span class="cx"> background-color: #f2f2f2;
</span><span class="lines">@@ -149,16 +149,6 @@
</span><span class="cx"> background-image: url("images/playlist-video.png");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#wp-image-toolbar {
- position: absolute;
- background-color: #333;
-}
-
-#wp-image-toolbar .dashicons {
- color: white;
- cursor: pointer;
-}
-
</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">@@ -216,12 +206,9 @@
</span><span class="cx"> /**
</span><span class="cx"> * Media previews
</span><span class="cx"> */
</span><del>-.wpview-type-gallery,
-.wpview-type-audio,
-.wpview-type-video {
</del><ins>+.wpview-wrap {
</ins><span class="cx"> position: relative;
</span><span class="cx"> margin-bottom: 16px;
</span><del>- cursor: pointer;
</del><span class="cx"> border: 1px solid transparent;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -252,45 +239,64 @@
</span><span class="cx"> clear: both;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wpview-type-gallery.selected,
-.wpview-type-audio,
-.wpview-type-video {
- background-color: #f2f8ff;
- border-color: #777;
-}
-
-.wpview-type-gallery .toolbar,
-.wpview-type-audio .toolbar,
-.wpview-type-video .toolbar {
</del><ins>+.wpview-wrap .toolbar {
</ins><span class="cx"> position: absolute;
</span><span class="cx"> top: 0;
</span><span class="cx"> right: 0;
</span><del>- background-color: #333;
- color: white;
</del><span class="cx"> display: none;
</span><span class="cx"> z-index: 100;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wpview-type-video .toolbar div,
-.wpview-type-gallery .toolbar div,
</del><ins>+#wp-image-toolbar {
+ position: absolute;
+}
+
+.wpview-wrap .toolbar div,
</ins><span class="cx"> #wp-image-toolbar div {
</span><del>- margin: 5px;
</del><ins>+ margin-top: 7px;
+ margin-right: 7px;
+ padding: 2px;
+ width: 30px;
+ height: 30px;
+ box-shadow: 0 1px 3px rgba(0,0,0,0.5);
+ background-color: #000;
+ background-color: rgba(0,0,0,0.9);
+ cursor: pointer;
+ color: white;
+ font-size: 30px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.wpview-type-audio .toolbar div {
- margin: 2px 5px;
</del><ins>+.wpview-wrap .toolbar div:hover,
+#wp-image-toolbar div:hover {
+ box-shadow: 0 1px 3px rgba(0,0,0,0.8);
+ background-color: #000;
+ color: #2ea2cc;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+/* temporary overrides; still pending styling */
+.wpview-type-audio .toolbar div,
+.wont-play .toolbar div {
+ margin: 0;
+ padding: 3px;
+ width: 20px;
+ height: 20px;
+ box-shadow: none;
+ font-size: 20px;
+}
+
+.wpview-wrap.selected .toolbar,
</ins><span class="cx"> .wpview-type-audio .toolbar,
</span><del>-.wpview-type-video .toolbar,
-.wpview-type-gallery.selected .toolbar {
</del><ins>+.wpview-type-video .toolbar {
</ins><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wpview-type-audio .toolbar span,
-.wpview-type-video .toolbar span,
-.wpview-type-gallery .toolbar span {
- cursor: pointer;
</del><ins>+.wpview-type-gallery.selected,
+.wpview-type-audio,
+.wpview-type-video {
+ background-color: #f2f8ff; /* fallback to old blue */
+ background-color: rgba(0,0,0,0.1);
+ border-color: #777;
+ border-color: rgba(0,0,0,0.3);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gallery img[data-mce-selected]:focus {
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (27627 => 27628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-03-19 23:07:24 UTC (rev 27627)
+++ trunk/src/wp-includes/media-template.php 2014-03-20 00:47:21 UTC (rev 27628)
</span><span class="lines">@@ -941,8 +941,7 @@
</span><span class="cx"> </script>
</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-edit edit"></div>
- <div class="dashicons dashicons-no-alt remove"></div>
</del><ins>+ <div class="dashicons dashicons-edit edit"></div><div class="dashicons dashicons-no-alt remove"></div>
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="gallery gallery-columns-{{{ data.columns }}}">
</span><span class="cx"> <# _.each( data.attachments, function( attachment, index ) { #>
</span><span class="lines">@@ -964,7 +963,7 @@
</span><span class="cx">
</span><span class="cx"> <script type="text/html" id="tmpl-editor-audio">
</span><span class="cx"> <div class="toolbar">
</span><del>- <div class="dashicons dashicons-format-audio 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"> <?php wp_underscore_audio_template() ?>
</span><span class="lines">@@ -972,7 +971,7 @@
</span><span class="cx">
</span><span class="cx"> <script type="text/html" id="tmpl-editor-video">
</span><span class="cx"> <div class="toolbar">
</span><del>- <div class="dashicons dashicons-format-video 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"> <?php wp_underscore_video_template() ?>
</span></span></pre></div>
<a id="trunksrcwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/version.php (27627 => 27628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/version.php 2014-03-19 23:07:24 UTC (rev 27627)
+++ trunk/src/wp-includes/version.php 2014-03-20 00:47:21 UTC (rev 27628)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global string $wp_version
</span><span class="cx"> */
</span><del>-$wp_version = '3.9-beta1-27615-src';
</del><ins>+$wp_version = '3.9-beta1-27628-src';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global string $tinymce_version
</span><span class="cx"> */
</span><del>-$tinymce_version = '4020-20140319';
</del><ins>+$tinymce_version = '4020-20140319a';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the required PHP version
</span></span></pre>
</div>
</div>
</body>
</html>