Changeset 29612

Timestamp:

08/26/2014 04:17:18 AM (12 years ago)

Author:

helen

Message:

Media Grid: Show upload errors above the grid rather than as a popup.

props pento, stephdau, helen. fixes #29141.

Location:

trunk/src

Files:

• wp-admin/css/media.css (modified) (3 diffs)
• wp-includes/js/media-views.js (modified) (1 diff)

trunk/src/wp-admin/css/media.css

@@ -457 +457 @@
 
 .upload-php .mode-grid .media-sidebar {
-        z-index: 1900;
-        top: 102px;
-        bottom: auto;
-        background: #fff;
-        border-left: none;
-        padding: 16px;
-        -webkit-box-shadow: -1px 0 1px rgba(0,0,0,.3);
-        box-shadow: -1px 0 1px rgba(0,0,0,.3);
+        position: relative;
+        width: auto;
+        margin-bottom: 16px;
+        padding: 0 16px;
+        border: 1px solid #c00;
+        background-color: #feebe8;
 }
 
@@ -474 +472 @@
         border-bottom: none;
         padding-bottom: 0;
+        max-width: 100%;
+}
+
+.upload-php .mode-grid .media-sidebar .upload-error {
+        margin: 20px 0;
+        padding: 0;
+        border: none;
+        background: none;
 }
 
 .upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors {
         font-size: 0;
-        top: -20px;
-        right:  -14px;
+        top: -12px;
+        right: -10px;
 }
 
@@ -1196 +1202 @@
         }
 }
+
+@media only screen and (max-width: 640px), screen and (max-height: 400px) {
+        .upload-php .mode-grid .media-sidebar{
+                max-width: 100%;
+        }
+}

trunk/src/wp-includes/js/media-views.js

@@ -5750 +5750 @@
 
                         this.createToolbar();
+                        if ( this.options.sidebar ) {
+                                this.createSidebar();
+                        }
                         this.createUploader();
                         this.createAttachments();
                         this.updateContent();
-                        if ( this.options.sidebar ) {
-                                this.createSidebar();
-                        }
 
                         if ( ! this.options.sidebar || 'errors' === this.options.sidebar ) {