WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

props pento, stephdau, helen. fixes #29141.

Built from https://develop.svn.wordpress.org/trunk@29612


git-svn-id: http://core.svn.wordpress.org/trunk@29386 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2014-08-26 04:18:17 +00:00
parent b7e33dcd5a
commit 60c6399d1c
6 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
wp-admin/css/media-rtl.css
View File

@ -456,14 +456,12 @@ border color while dragging a file over the uploader drop area */
}
.upload-php .mode-grid .media-sidebar {
z-index: 1900;
top: 102px;
bottom: auto;
background: #fff;
border-right: 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;
}
.upload-php .mode-grid .hide-sidebar .media-sidebar {
@ -473,12 +471,20 @@ border color while dragging a file over the uploader drop area */
.upload-php .mode-grid .media-sidebar .media-uploader-status {
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;
left: -14px;
top: -12px;
left: -10px;
}
.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:before {
@ -1195,3 +1201,9 @@ audio, video {
width: 100%;
}
}
@media only screen and (max-width: 640px), screen and (max-height: 400px) {
.upload-php .mode-grid .media-sidebar{
max-width: 100%;
}
}

32
wp-admin/css/media.css
View File

@ -456,14 +456,12 @@ border color while dragging a file over the uploader drop area */
}
.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;
}
.upload-php .mode-grid .hide-sidebar .media-sidebar {
@ -473,12 +471,20 @@ border color while dragging a file over the uploader drop area */
.upload-php .mode-grid .media-sidebar .media-uploader-status {
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;
}
.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:before {
@ -1195,3 +1201,9 @@ audio, video {
width: 100%;
}
}
@media only screen and (max-width: 640px), screen and (max-height: 400px) {
.upload-php .mode-grid .media-sidebar{
max-width: 100%;
}
}

2
wp-admin/css/wp-admin-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/wp-admin.min.css vendored
View File

File diff suppressed because one or more lines are too long

6
wp-includes/js/media-views.js
View File

@ -5749,12 +5749,12 @@
this.listenTo( this.controller, 'toggle:upload:attachment', _.bind( this.toggleUploader, this ) );
this.createToolbar();
this.createUploader();
this.createAttachments();
this.updateContent();
if ( this.options.sidebar ) {
this.createSidebar();
}
this.createUploader();
this.createAttachments();
this.updateContent();
if ( ! this.options.sidebar || 'errors' === this.options.sidebar ) {
this.$el.addClass( 'hide-sidebar' );

2
wp-includes/js/media-views.min.js vendored
View File

File diff suppressed because one or more lines are too long