sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert [29287] based on design and core team feedback. see #29012.

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@29447 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Helen Hou-Sandi 2014-08-08 19:00:28 +00:00
parent f4e7b2a6ad
commit d837ad9fa3
2 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wp-admin/css/colors/_admin.scss
View File

@ -416,15 +416,6 @@ ul#adminmenu > li.current > a.current:after {
box-shadow: 0 0 0 1px #fff, 0 0 0 2px $highlight-color; box-shadow: 0 0 0 1px #fff, 0 0 0 2px $highlight-color;
} }
.media-modal-close:hover,
.edit-attachment-frame .edit-media-header .right:hover,
.edit-attachment-frame .edit-media-header .left:hover,
.media-modal-close:focus,
.edit-attachment-frame .edit-media-header .right:focus,
.edit-attachment-frame .edit-media-header .left:focus {
background: $menu-highlight-background;
color: $menu-highlight-text;
}
/* Themes */ /* Themes */

55
src/wp-includes/css/media-views.css
View File

@ -140,42 +140,35 @@
.media-modal-close { .media-modal-close {
position: absolute; position: absolute;
text-decoration: none; text-decoration: none;
top: 0; top: 5px;
right: 0; right: 10px;
width: 50px; width: 30px;
height: 50px; height: 30px;
z-index: 1000; z-index: 1000;
color: #777;
-webkit-transition: color .1s ease-in-out, background .1s ease-in-out; -webkit-transition: color .1s ease-in-out, background .1s ease-in-out;
transition: color .1s ease-in-out, background .1s ease-in-out; transition: color .1s ease-in-out, background .1s ease-in-out;
} }
.media-modal-close span.media-modal-icon { .media-modal-close span.media-modal-icon {
display: none; display: block;
margin: 8px auto 0; margin: 8px auto 0;
width: 15px; width: 15px;
height: 15px; height: 15px;
background-image: none; background-image: none;
} }
.media-modal-close:before { .media-modal-close .media-modal-icon:before {
position: absolute; content: '\f158';
top: 1px; font: normal 20px/1 'dashicons';
left: 11px;
font: normal 30px/50px 'dashicons' !important;
content: '\f335';
font-weight: 300;
speak: none; speak: none;
vertical-align: middle;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
color: #666;
} }
.media-modal-close:focus, .media-modal-close:hover .media-modal-icon:before {
.media-modal-close:hover { color: #2ea2cc;
background: #0074a2;
color: #fff;
-webkit-box-shadow: none;
box-shadow: none;
} }
.media-modal-close:active { .media-modal-close:active {
@ -2554,9 +2547,20 @@
overflow: hidden; overflow: hidden;
} }
.upload-php .media-modal-close:before { .upload-php .media-modal-close .media-modal-icon:before {
top: 4px; content: '\f335';
left: 14px; font-size: 30px;
}
.upload-php .media-modal-close:hover .media-modal-icon:before,
.upload-php .media-modal-close:focus .media-modal-icon:before {
color: #fff;
}
.upload-php .media-modal-close .media-modal-icon {
margin-top: 13px;
width: 30px;
height: 30px;
} }
.upload-php .media-modal-close, .upload-php .media-modal-close,
@ -2576,6 +2580,11 @@
transition: color .1s ease-in-out, background .1s ease-in-out; transition: color .1s ease-in-out, background .1s ease-in-out;
} }
.upload-php .media-modal-close {
top: 0;
right: 0;
}
.edit-attachment-frame .edit-media-header .left { .edit-attachment-frame .edit-media-header .left {
right: 112px; right: 112px;
} }
@ -2608,8 +2617,6 @@
.edit-attachment-frame .edit-media-header .left.disabled, .edit-attachment-frame .edit-media-header .left.disabled,
.edit-attachment-frame .edit-media-header .right.disabled, .edit-attachment-frame .edit-media-header .right.disabled,
.edit-attachment-frame .edit-media-header .left.disabled:focus,
.edit-attachment-frame .edit-media-header .right.disabled:focus,
.edit-attachment-frame .edit-media-header .left.disabled:hover, .edit-attachment-frame .edit-media-header .left.disabled:hover,
.edit-attachment-frame .edit-media-header .right.disabled:hover { .edit-attachment-frame .edit-media-header .right.disabled:hover {
color: #ccc; color: #ccc;