Ticket #29047: 29047.6.patch

src/wp-admin/async-upload.php

@@ -86 +86 @@
 
 $id = media_handle_upload( 'async-upload', $post_id );
 if ( is_wp_error($id) ) {
-        echo '<div class="error-div">
+        echo '<div class="error-div error">
         <a class="dismiss" href="#" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __('Dismiss') . '</a>
         <strong>' . sprintf(__('&#8220;%s&#8221; has failed to upload due to an error'), esc_html($_FILES['async-upload']['name']) ) . '</strong><br />' .
         esc_html($id->get_error_message()) . '</div>';

src/wp-admin/css/media.css

@@ -102 +102 @@
         display: block;
         line-height: 36px;
         float: right;
-        margin-right: 6px;
+        margin-right: 10px;
 }
 
 .media-item .describe-toggle-off,
@@ -114 +114 @@
         display: block;
 }
 
-#media-items .media-item {
-        border-bottom: 1px solid #dfdfdf;
+.media-upload-form .media-item {
         min-height: 36px;
+        margin-bottom: 1px;
         position: relative;
         width: 100%;
         background: #fff;
 }
 
-.media-new-php #media-items {
-        margin: 1em 0;
+.media-upload-form .media-item,
+.media-upload-form .media-item .error {
+        -webkit-box-shadow: 0 1px 0 #dfdfdf;
+        box-shadow: 0 1px 0 #dfdfdf;
 }
 
 #media-items:empty {
@@ -136 +138 @@
         margin-left: 6px;
 }
 
-.media-item .error-div {
-        padding-left: 10px;
-}
-
 .media-item .pinkynail {
         float: left;
         margin: 2px 10px 0 3px;
@@ -208 +206 @@
         display: block;
 }
 
-.media-upload-form .media-item.error {
-        margin: 0;
-        padding: 0;
+.media-upload-form .media-item.error,
+.media-upload-form .media-item .error {
+        width: auto;
+        margin: 0 0 1px 0;
 }
 
-.media-upload-form .media-item.error p,
-.media-item .error-div {
-        line-height: 16px;
-        margin: 5px 10px;
-        padding: 0;
+.media-upload-form .media-item .error {
+        padding: 10px 0 10px 14px;
 }
 
 .media-item .error-div a.dismiss {
         display: block;
         float: right;
-        margin: 5px 4px 0 15px;
+        margin: 0 10px 0 15px;
 }
 
 /*------------------------------------------------------------------------------
@@ -505 +501 @@
 }
 
 .media-disabled,
-.imgedit-settings .disabled  {
+.imgedit-settings .disabled {
         color: grey;
 }
 
@@ -720 +716 @@
                 font-size: 14px;
                 line-height: 1.5em;
         }
+
+        .media-upload-form .media-item.error,
+        .media-upload-form .media-item .error {
+                font-size: 13px;
+                line-height: 1.5;
+        }
+
+        .media-upload-form .media-item.error {
+                padding: 1px 10px;
+        }
+
+        .media-upload-form .media-item .error {
+                padding: 10px 0 10px 12px;
+        }
 }

src/wp-admin/includes/media.php

@@ -1856 +1856 @@
 ?>
 </div>
 
-<span class="max-upload-size"><?php printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) ); ?></span>
+<p class="max-upload-size"><?php printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) ); ?></p>
 <?php
 
         /**