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;
} }
@ -653,9 +665,9 @@ form.upgrade .hint {
padding: 0 25px 0 0; padding: 0 25px 0 0;
} }
.welcome-panel .welcome-panel-column ul { .welcome-panel .welcome-panel-column ul {
margin: 1.6em 1.3em 1em 1em; margin: 1.6em 1.3em 1em 1em;
} }
.welcome-panel .welcome-panel-column li { .welcome-panel .welcome-panel-column li {
padding-left: 0; padding-left: 0;
@ -1311,7 +1323,7 @@ h2 .nav-tab {
#wpcontent, #wpcontent,
#footer { #footer {
margin-right: 165px; margin-right: 165px;
} }
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
@ -1329,7 +1341,7 @@ h2 .nav-tab {
margin-left: 200px; margin-left: 200px;
} }
.about-wrap h2.nav-tab-wrapper { .about-wrap h2.nav-tab-wrapper {
padding-left: 0px; padding-left: 0px;
padding-right: 6px; padding-right: 6px;
} }
@ -1380,7 +1392,7 @@ h2 .nav-tab {
.about-wrap .feature-section.images-stagger-right .angled-left, .about-wrap .feature-section.images-stagger-right .angled-left,
.about-wrap .feature-section.images-stagger-left .angled-left { .about-wrap .feature-section.images-stagger-left .angled-left {
float: left; float: left;
} }
.about-wrap .feature-section.three-col img { .about-wrap .feature-section.three-col img {
margin: 0.5em 0 1em 0; margin: 0.5em 0 1em 0;
@ -1846,7 +1858,7 @@ body.login {
.login #nav, .login #nav,
.login #backtoblog { .login #backtoblog {
margin: 0 16px 0 0; margin: 0 16px 0 0;
} }
#login_error, #login_error,
@ -2249,8 +2261,8 @@ h3.tb {
} }
#template textarea { #template textarea {
direction: ltr; direction: ltr;
} }
/* theme-install */ /* theme-install */
div.star { div.star {

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;
@ -4823,7 +4831,7 @@ input.button-highlighted,
} }
.about-wrap div.updated, .about-wrap div.updated,
.about-wrap div.error { .about-wrap div.error {
display: none !important; display: none !important;
} }
/* Typography */ /* Typography */
@ -4888,7 +4896,7 @@ input.button-highlighted,
font-weight: bold; font-weight: bold;
font-size: 14px; font-size: 14px;
text-align: center; text-align: center;
margin: 0 -5px; margin: 0 -5px;
background: url('../images/wp-badge.png?ver=20111120') no-repeat; background: url('../images/wp-badge.png?ver=20111120') no-repeat;
@ -4929,9 +4937,9 @@ input.button-highlighted,
} }
.about-wrap .feature-section img { .about-wrap .feature-section img {
margin: 5px auto; margin: 5px auto;
border: none; border: none;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
@ -4978,7 +4986,7 @@ input.button-highlighted,
.about-wrap .feature-section.three-col div { .about-wrap .feature-section.three-col div {
width: 30%; width: 30%;
margin-right: 4.999999999%; margin-right: 4.999999999%;
float: left; float: left;
} }
.about-wrap .feature-section.three-col h4 { .about-wrap .feature-section.three-col h4 {
@ -5020,9 +5028,9 @@ input.button-highlighted,
} }
.about-wrap .feature-section.images-stagger-left .feature-images { .about-wrap .feature-section.images-stagger-left .feature-images {
left: 0; left: 0;
} }
.about-wrap .feature-section.images-stagger-right .left-feature { .about-wrap .feature-section.images-stagger-right .left-feature {
margin-right: 350px; margin-right: 350px;
} }
.about-wrap .feature-section.images-stagger-left .right-feature { .about-wrap .feature-section.images-stagger-left .right-feature {
margin-left: 350px; margin-left: 350px;

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' );