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

Media: Visually align upload errors with other admin notices. 

props sagarjadhav.
fixes #31874.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32476 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2015-05-15 16:19:26 +00:00
parent 8cbfdfa51b
commit 1e8a787aa1
10 changed files with 41 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -459,8 +459,9 @@ border color while dragging a file over the uploader drop area */
width: auto; width: auto;
margin-bottom: 16px; margin-bottom: 16px;
padding: 0 16px; padding: 0 16px;
border: 1px solid #c00; border-right: 4px solid #dd3d36;
background-color: #feebe8; box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
background-color: #fff;
} }
.upload-php .mode-grid .hide-sidebar .media-sidebar { .upload-php .mode-grid .hide-sidebar .media-sidebar {
@ -474,27 +475,28 @@ border color while dragging a file over the uploader drop area */
} }
.upload-php .mode-grid .media-sidebar .upload-error { .upload-php .mode-grid .media-sidebar .upload-error {
margin: 20px 0; margin: 12px 0;
padding: 0; padding: 4px 0 0;
border: none; border: none;
box-shadow: none;
background: none; background: none;
} }
.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors { .upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors {
font-size: 0; font-size: 0;
top: -12px; top: 0;
left: -10px; left: -6px;
} }
.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:before { .upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:before {
content: "\f158"; content: "\f153";
font: normal 20px/1 dashicons; font: normal 16px/1 dashicons;
color: #666; color: #bbb;
} }
.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:focus:before, .upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:focus:before,
.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:hover:before { .upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:hover:before {
color: #00a0d2; color: #c00;
} }
.upload-php .mode-grid .media-sidebar .media-uploader-status.errors h3 { .upload-php .mode-grid .media-sidebar .media-uploader-status.errors h3 {

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

@ -459,8 +459,9 @@ border color while dragging a file over the uploader drop area */
width: auto; width: auto;
margin-bottom: 16px; margin-bottom: 16px;
padding: 0 16px; padding: 0 16px;
border: 1px solid #c00; border-left: 4px solid #dd3d36;
background-color: #feebe8; box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
background-color: #fff;
} }
.upload-php .mode-grid .hide-sidebar .media-sidebar { .upload-php .mode-grid .hide-sidebar .media-sidebar {
@ -474,27 +475,28 @@ border color while dragging a file over the uploader drop area */
} }
.upload-php .mode-grid .media-sidebar .upload-error { .upload-php .mode-grid .media-sidebar .upload-error {
margin: 20px 0; margin: 12px 0;
padding: 0; padding: 4px 0 0;
border: none; border: none;
box-shadow: none;
background: none; background: none;
} }
.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors { .upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors {
font-size: 0; font-size: 0;
top: -12px; top: 0;
right: -10px; right: -6px;
} }
.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:before { .upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:before {
content: "\f158"; content: "\f153";
font: normal 20px/1 dashicons; font: normal 16px/1 dashicons;
color: #666; color: #bbb;
} }
.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:focus:before, .upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:focus:before,
.upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:hover:before { .upload-php .mode-grid .media-sidebar .media-uploader-status .upload-dismiss-errors:hover:before {
color: #00a0d2; color: #c00;
} }
.upload-php .mode-grid .media-sidebar .media-uploader-status.errors h3 { .upload-php .mode-grid .media-sidebar .media-uploader-status.errors h3 {

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

27
wp-includes/css/media-views-rtl.css
View File

@ -1174,10 +1174,6 @@
max-width: 400px; max-width: 400px;
} }
.media-sidebar .media-uploader-status {
border-bottom: 1px solid #dfdfdf;
}
.uploader-inline .media-uploader-status h3 { .uploader-inline .media-uploader-status h3 {
display: none; display: none;
} }
@ -1221,31 +1217,20 @@
} }
.upload-errors .upload-error { .upload-errors .upload-error {
margin: 8px auto 0 auto; padding: 12px;
padding: 8px; margin-bottom: 12px;
border: 1px #c00 solid; background: #fff;
background: #ffebe8; border-right: 4px solid #dd3d36;
-webkit-border-radius: 3px; box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
border-radius: 3px;
} }
.upload-errors .upload-error-label { .upload-errors .upload-error-filename {
padding: 2px 4px;
margin-left: 8px;
font-weight: bold; font-weight: bold;
color: #fff;
background: #e00;
background-image: -webkit-gradient(linear, right top, right bottom, from(#e00), to(#a00));
background-image: -webkit-linear-gradient(top, #e00, #a00);
background-image: linear-gradient(to bottom, #e00, #a00);
-webkit-border-radius: 3px;
border-radius: 3px;
} }
.upload-errors .upload-error-message { .upload-errors .upload-error-message {
display: block; display: block;
padding-top: 8px; padding-top: 8px;
color: #b44;
word-wrap: break-word; word-wrap: break-word;
} }

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

File diff suppressed because one or more lines are too long

27
wp-includes/css/media-views.css
View File

@ -1174,10 +1174,6 @@
max-width: 400px; max-width: 400px;
} }
.media-sidebar .media-uploader-status {
border-bottom: 1px solid #dfdfdf;
}
.uploader-inline .media-uploader-status h3 { .uploader-inline .media-uploader-status h3 {
display: none; display: none;
} }
@ -1221,31 +1217,20 @@
} }
.upload-errors .upload-error { .upload-errors .upload-error {
margin: 8px auto 0 auto; padding: 12px;
padding: 8px; margin-bottom: 12px;
border: 1px #c00 solid; background: #fff;
background: #ffebe8; border-left: 4px solid #dd3d36;
-webkit-border-radius: 3px; box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1);
border-radius: 3px;
} }
.upload-errors .upload-error-label { .upload-errors .upload-error-filename {
padding: 2px 4px;
margin-right: 8px;
font-weight: bold; font-weight: bold;
color: #fff;
background: #e00;
background-image: -webkit-gradient(linear, left top, left bottom, from(#e00), to(#a00));
background-image: -webkit-linear-gradient(top, #e00, #a00);
background-image: linear-gradient(to bottom, #e00, #a00);
-webkit-border-radius: 3px;
border-radius: 3px;
} }
.upload-errors .upload-error-message { .upload-errors .upload-error-message {
display: block; display: block;
padding-top: 8px; padding-top: 8px;
color: #b44;
word-wrap: break-word; word-wrap: break-word;
} }

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

File diff suppressed because one or more lines are too long

1
wp-includes/media-template.php
View File

@ -273,7 +273,6 @@ function wp_print_media_templates() {
</script> </script>
<script type="text/html" id="tmpl-uploader-status-error"> <script type="text/html" id="tmpl-uploader-status-error">
<span class="upload-error-label"><?php _e('Error'); ?></span>
<span class="upload-error-filename">{{{ data.filename }}}</span> <span class="upload-error-filename">{{{ data.filename }}}</span>
<span class="upload-error-message">{{ data.message }}</span> <span class="upload-error-message">{{ data.message }}</span>
</script> </script>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-alpha-32505'; $wp_version = '4.3-alpha-32506';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.