Remove help sidebar background when no sidebar exists. props chrisbliss18, see #18197, [19361].

git-svn-id: http://svn.automattic.com/wordpress/trunk@19430 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
koopersmith 2011-11-23 22:14:03 +00:00
parent eecf9dc3c1
commit 5ff76fd777
6 changed files with 48 additions and 22 deletions

File diff suppressed because one or more lines are too long

View File

@ -368,6 +368,18 @@ form.upgrade .hint {
right: 150px; right: 150px;
} }
#contextual-help-wrap.no-sidebar #contextual-help-back {
left: 0;
right: 150px;
border-right-width: 1px;
border-left-width: 0;
-webkit-border-bottom-right-radius: 0;
border-bottom-right-radius: 0;
-webkit-border-bottom-left-radius: 2px;
border-bottom-left-radius: 2px;
}
.contextual-help-tabs { .contextual-help-tabs {
float: right; float: right;
} }

File diff suppressed because one or more lines are too long

View File

@ -1469,6 +1469,14 @@ form.upgrade .hint {
border-style: solid; border-style: solid;
} }
#contextual-help-wrap.no-sidebar #contextual-help-back {
right: 0;
border-right-width: 0;
-webkit-border-bottom-right-radius: 2px;
border-bottom-right-radius: 2px;
}
.contextual-help-tabs { .contextual-help-tabs {
float: left; float: left;
width: 150px; width: 150px;

View File

@ -687,11 +687,17 @@ final class WP_Screen {
) ); ) );
} }
$has_sidebar = ! empty( $this->_help_sidebar );
$help_class = 'hidden';
if ( ! $has_sidebar )
$help_class .= ' no-sidebar';
// Time to render! // Time to render!
?> ?>
<div id="screen-meta" class="metabox-prefs"> <div id="screen-meta" class="metabox-prefs">
<div id="contextual-help-wrap" class="hidden"> <div id="contextual-help-wrap" class="<?php echo esc_attr( $help_class ); ?>">
<div id="contextual-help-back"></div> <div id="contextual-help-back"></div>
<div id="contextual-help-columns"> <div id="contextual-help-columns">
<div class="contextual-help-tabs"> <div class="contextual-help-tabs">
@ -711,7 +717,7 @@ final class WP_Screen {
</ul> </ul>
</div> </div>
<?php if ( ! empty( $this->_help_sidebar ) ) : ?> <?php if ( $has_sidebar ) : ?>
<div class="contextual-help-sidebar"> <div class="contextual-help-sidebar">
<?php echo self::$this->_help_sidebar; ?> <?php echo self::$this->_help_sidebar; ?>
</div> </div>

View File

@ -433,7 +433,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(), '20111123' ); $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20111123a' );
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20111119' ); $styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20111119' );
$styles->add_data( 'ie', 'conditional', 'lte IE 7' ); $styles->add_data( 'ie', 'conditional', 'lte IE 7' );