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

Fix the uploader popup in DWF, reduce the height of the drop area, see #17144 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18778 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-09-26 19:23:43 +00:00
parent 59cb3c0ddd
commit 5ca2255bba
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

4
wp-admin/css/wp-admin.dev.css
View File

@ -3735,11 +3735,11 @@ form.upgrade .hint {
.drag-drop #drag-drop-area { .drag-drop #drag-drop-area {
border: 4px dashed #DDDDDD; border: 4px dashed #DDDDDD;
height: 300px; height: 200px;
} }
.drag-drop .drag-drop-inside { .drag-drop .drag-drop-inside {
padding-top: 100px; padding-top: 50px;
} }
.drag-drop .drag-drop-inside p { .drag-drop .drag-drop-inside p {

8
wp-admin/js/wp-fullscreen.dev.js
View File

@ -484,8 +484,14 @@ PubSub.prototype.publish = function( topic, args ) {
} }
api.medialib = function() { api.medialib = function() {
if ( s.has_tinymce && 'tinymce' === s.mode ) if ( s.has_tinymce && 'tinymce' === s.mode ) {
tinyMCE.execCommand('WP_Medialib'); tinyMCE.execCommand('WP_Medialib');
} else {
var href = $('#wp-' + s.editor_id + '-media-buttons a.thickbox').attr('href') || '';
if ( href )
tb_show('', href);
}
} }
api.refresh_buttons = function( fade ) { api.refresh_buttons = function( fade ) {

2
wp-admin/js/wp-fullscreen.js
View File

File diff suppressed because one or more lines are too long

4
wp-includes/script-loader.php
View File

@ -86,7 +86,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array('utils','jquery'), '20110820', 1 ); $scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array('utils','jquery'), '20110820', 1 );
$scripts->add( 'wp-fullscreen', "/wp-admin/js/wp-fullscreen$suffix.js", array('jquery'), '20110918', 1 ); $scripts->add( 'wp-fullscreen', "/wp-admin/js/wp-fullscreen$suffix.js", array('jquery'), '20110926', 1 );
$scripts->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6.1'); $scripts->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6.1');
@ -429,7 +429,7 @@ function wp_default_styles( &$styles ) {
// Any rtl stylesheets that don't have a .dev version for ltr // Any rtl stylesheets that don't have a .dev version for ltr
$no_suffix = array( 'farbtastic' ); $no_suffix = array( 'farbtastic' );
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20110925' ); $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20110926' );
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20110919' ); $styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20110919' );
$styles->add_data( 'ie', 'conditional', 'lte IE 7' ); $styles->add_data( 'ie', 'conditional', 'lte IE 7' );