Ticket #27320: 27320.2.diff

src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js

@@ -348 +348 @@
                 dom.setAttrib( node, 'data-wp-imgselect', 1 );
                 rectangle = dom.getRect( node );
 
-                toolbarHtml = '<div class="dashicons dashicons-edit edit" data-mce-bogus="1"></div> ' +
+                toolbarHtml = '<div class="dashicons dashicons-edit edit" data-mce-bogus="1"></div>' +
                         '<div class="dashicons dashicons-no-alt remove" data-mce-bogus="1"></div>';
 
                 toolbar = dom.create( 'div', {

src/wp-includes/js/tinymce/skins/wordpress/wp-content.css

@@ -115 +115 @@
     border-top: 3px dotted #bbb;
 }
 
-/* Gallery, audio, vudeo placeholders */
+/* Gallery, audio, video placeholders */
 .mce-content-body img.wp-media {
         border: 1px solid #aaa;
         background-color: #f2f2f2;
@@ -149 +149 @@
         background-image: url("images/playlist-video.png");
 }
 
-#wp-image-toolbar {
-        position: absolute;
-        background-color: #333;
-}
-
-#wp-image-toolbar .dashicons {
-        color: white;
-        cursor: pointer;
-}
-
 /* Image resize handles */
 .mce-content-body div.mce-resizehandle {
         border-color: #777;
@@ -216 +206 @@
 /**
  * Media previews
  */
-.wpview-type-gallery,
-.wpview-type-audio,
-.wpview-type-video {
+.wpview-wrap {
     position: relative;
     margin-bottom: 16px;
-        cursor: pointer;
         border: 1px solid transparent;
 }
 
@@ -252 +239 @@
     clear: both;
 }
 
-.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 {
+.wpview-wrap .toolbar {
         position: absolute;
         top: 0;
         right: 0;
-        background-color: #333;
-        color: white;
         display: none;
         z-index: 100;
 }
 
-.wpview-type-video .toolbar div,
-.wpview-type-gallery .toolbar div,
+#wp-image-toolbar {
+        position: absolute;
+}
+
+.wpview-wrap .toolbar div,
 #wp-image-toolbar div {
-        margin: 5px;
+        margin-top: 7px;
+        margin-right: 7px;
+        padding: 2px;
+        width: 40px;
+        height: 40px;
+        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: 40px;
 }
 
-.wpview-type-audio .toolbar div {
-        margin: 2px 5px;
+.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;
 }
 
+/* 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,
 .wpview-type-audio .toolbar,
-.wpview-type-video .toolbar,
-.wpview-type-gallery.selected .toolbar {
+.wpview-type-video .toolbar {
         display: block;
 }
 
-.wpview-type-audio .toolbar span,
-.wpview-type-video .toolbar span,
-.wpview-type-gallery .toolbar span {
-        cursor: pointer;
+.wpview-type-gallery.selected,
+.wpview-type-audio,
+.wpview-type-video {
+        background-color: #f2f8ff;
+        border-color: #777;
 }
 
 .gallery img[data-mce-selected]:focus {

src/wp-includes/media-template.php

@@ -941 +941 @@
         </script>
         <script type="text/html" id="tmpl-editor-gallery">
                 <div class="toolbar">
-                        <div class="dashicons dashicons-edit edit"></div>
-                        <div class="dashicons dashicons-no-alt remove"></div>
+                        <div class="dashicons dashicons-edit edit"></div><div class="dashicons dashicons-no-alt remove"></div>
                 </div>
                 <div class="gallery gallery-columns-{{{ data.columns }}}">
                         <# _.each( data.attachments, function( attachment, index ) { #>
@@ -964 +963 @@
 
         <script type="text/html" id="tmpl-editor-audio">
                 <div class="toolbar">
-                        <div class="dashicons dashicons-format-audio edit"></div>
+                        <div class="dashicons dashicons-edit edit"></div>
                         <div class="dashicons dashicons-no-alt remove"></div>
                 </div>
                 <?php wp_underscore_audio_template() ?>
@@ -972 +971 @@
 
         <script type="text/html" id="tmpl-editor-video">
                 <div class="toolbar">
-                        <div class="dashicons dashicons-format-video edit"></div>
+                        <div class="dashicons dashicons-edit edit"></div>
                         <div class="dashicons dashicons-no-alt remove"></div>
                 </div>
                 <?php wp_underscore_video_template() ?>

src/wp-includes/version.php

@@ -4 +4 @@
  *
  * @global string $wp_version
  */
-$wp_version = '3.9-beta1-27615-src';
+$wp_version = '3.9-beta1-27625-src';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
@@ -18 +18 @@
  *
  * @global string $tinymce_version
  */
-$tinymce_version = '4020-20140319';
+$tinymce_version = '4020-20140319a';
 
 /**
  * Holds the required PHP version