Limit height only to iframe body. Fixes #15679

git-svn-id: http://svn.automattic.com/wordpress/trunk@16937 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
scribu 2010-12-15 10:39:50 +00:00
parent bb27a217a5
commit 87c95d40f8
4 changed files with 4 additions and 3 deletions

File diff suppressed because one or more lines are too long

View File

@ -4135,7 +4135,7 @@ table .column-rating {
}
/* Scrollbar fix for bulk upgrade iframe */
body.update-php {
body.iframe {
height: 98%;
}

View File

@ -1538,6 +1538,7 @@ function iframe_header( $title = '', $limit_styles = false ) {
show_admin_bar( false );
global $hook_suffix, $current_screen, $current_user, $admin_body_class, $wp_locale;
$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
$admin_body_class .= ' iframe';
?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>

View File

@ -485,7 +485,7 @@ function wp_default_styles( &$styles ) {
// Any rtl stylesheets that don't have a .dev version for ltr
$no_suffix = array( 'farbtastic' );
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20101214' );
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20101215' );
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20101102' );
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );