Ticket #21196: 21196.4.patch

wp-admin/css/colors-classic.dev.css

@@ -497 +497 @@
         border-bottom-color: #f00;
 }
 
-.submitbox .submitdelete:hover,
-#media-items a.delete:hover {
+.submitbox .submitdelete:hover {
         color: #fff;
         background-color: #f00;
         border-bottom-color: #f00;
@@ -588 +587 @@
 #adminmenu a,
 #the-comment-list p.comment-author strong a,
 #media-upload a.del-link,
-#media-items a.delete,
 .plugins a.delete,
 .ui-tabs-nav a {
         color: #21759b;

wp-admin/css/colors-fresh.dev.css

@@ -488 +488 @@
         border-bottom-color: #f00;
 }
 
-.submitbox .submitdelete:hover,
-#media-items a.delete:hover {
+.submitbox .submitdelete:hover {
         color: #fff;
         background-color: #f00;
         border-bottom-color: #f00;
@@ -579 +578 @@
 #adminmenu a,
 #the-comment-list p.comment-author strong a,
 #media-upload a.del-link,
-#media-items a.delete,
 .plugins a.delete,
 .ui-tabs-nav a {
         color: #21759b;

wp-admin/css/media.dev.css

@@ -197 +197 @@
         margin: 0 20px;
 }
 
-#media-items a.delete {
-        display: block;
-        float: right;
-}
-
 #media-upload .widefat {
         width: 626px;
         border-style: solid solid none;

wp-admin/css/wp-admin-rtl.dev.css

@@ -184 +184 @@
         text-align: left;
 }
 
-.describe .del-link {
-        padding-left: 0;
-        padding-right: 5px;
-}
 
-
 /*------------------------------------------------------------------------------
   4.0 - Notifications
 ------------------------------------------------------------------------------*/

wp-admin/css/wp-admin.dev.css

@@ -1022 +1022 @@
         text-align: right;
 }
 
-.describe .del-link {
-        padding-left: 5px;
-}
 
-
 /*------------------------------------------------------------------------------
   4.0 - Notifications
 ------------------------------------------------------------------------------*/

wp-admin/includes/media.php

@@ -1160 +1160 @@
                 $send = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false );
         if ( $delete && current_user_can( 'delete_post', $attachment_id ) ) {
                 if ( !EMPTY_TRASH_DAYS ) {
-                        $delete = "<a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-attachment_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Delete Permanently' ) . '</a>';
+                        $delete = "<a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-attachment_' . $attachment_id ) . "' id='del[$attachment_id]' class='del-link'>" . __( 'Delete Permanently' ) . '</a>';
                 } elseif ( !MEDIA_TRASH ) {
                         $delete = "<a href='#' class='del-link' onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __( 'Delete' ) . "</a>
                          <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'><p>" . sprintf( __( 'You are about to delete <strong>%s</strong>.' ), $filename ) . "</p>
@@ -1168 +1168 @@
                          <a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __( 'Cancel' ) . "</a>
                          </div>";
                 } else {
-                        $delete = "<a href='" . wp_nonce_url( "post.php?action=trash&amp;post=$attachment_id", 'trash-attachment_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a>
+                        $delete = "<a href='" . wp_nonce_url( "post.php?action=trash&amp;post=$attachment_id", 'trash-attachment_' . $attachment_id ) . "' id='del[$attachment_id]' class='del-link'>" . __( 'Move to Trash' ) . "</a>
                         <a href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$attachment_id", 'untrash-attachment_' . $attachment_id ) . "' id='undo[$attachment_id]' class='undo hidden'>" . __( 'Undo' ) . "</a>";
                 }
         } else {