Help tabs: remove scrollbar and max-height. see #19155.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19361 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
koopersmith
parent
2dd43e3337
commit
c65d96de08
File diff suppressed because one or more lines are too long
|
|
@ -1646,12 +1646,16 @@ table.diff .diff-addedline ins {
|
|||
box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 );
|
||||
}
|
||||
|
||||
#contextual-help-back {
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.contextual-help-tabs a:hover {
|
||||
background-color: #ceeaff;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.contextual-help-sidebar,
|
||||
#contextual-help-back,
|
||||
.contextual-help-tabs .active {
|
||||
border-color: #D1E5EE;
|
||||
}
|
||||
|
|
@ -1663,12 +1667,6 @@ table.diff .diff-addedline ins {
|
|||
color: #000;
|
||||
}
|
||||
|
||||
.contextual-help-tabs-wrap {
|
||||
border-color: #D1E5EE;
|
||||
border-right: 0;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
/* screen options and help tabs */
|
||||
#screen-options-link-wrap,
|
||||
#contextual-help-link-wrap {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -787,11 +787,15 @@ table.widefat span.spam a,
|
|||
box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 );
|
||||
}
|
||||
|
||||
#contextual-help-back {
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.contextual-help-tabs a:hover {
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.contextual-help-sidebar,
|
||||
#contextual-help-back,
|
||||
.contextual-help-tabs .active {
|
||||
border-color: #ccc;
|
||||
}
|
||||
|
|
@ -803,11 +807,6 @@ table.widefat span.spam a,
|
|||
color: #000;
|
||||
}
|
||||
|
||||
.contextual-help-tabs-wrap {
|
||||
border-color: #ccc;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
/* screen options and help tabs */
|
||||
#screen-options-link-wrap,
|
||||
#contextual-help-link-wrap {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1354,7 +1354,6 @@ form.upgrade .hint {
|
|||
#contextual-help-wrap {
|
||||
margin: 0;
|
||||
padding: 8px 20px 12px;
|
||||
max-height: 300px;
|
||||
position: relative;
|
||||
overflow: auto;
|
||||
}
|
||||
|
|
@ -1370,6 +1369,7 @@ form.upgrade .hint {
|
|||
/* screen options and help tabs revert */
|
||||
#screen-meta {
|
||||
display: none;
|
||||
position: relative;
|
||||
margin: 0 15px 0 5px;
|
||||
border-width: 0 1px 1px;
|
||||
border-style: none solid solid;
|
||||
|
|
@ -1452,6 +1452,20 @@ form.upgrade .hint {
|
|||
margin-left: -4px;
|
||||
}
|
||||
|
||||
#contextual-help-columns {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
#contextual-help-back {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
left: 150px;
|
||||
right: 170px;
|
||||
border-width: 0 1px;
|
||||
border-style: solid;
|
||||
}
|
||||
|
||||
.contextual-help-tabs {
|
||||
float: left;
|
||||
width: 150px;
|
||||
|
|
@ -1487,8 +1501,6 @@ form.upgrade .hint {
|
|||
.contextual-help-tabs-wrap {
|
||||
padding: 0 20px;
|
||||
overflow: auto;
|
||||
border-left-width: 1px;
|
||||
border-left-style: solid;
|
||||
}
|
||||
|
||||
.help-tab-content {
|
||||
|
|
@ -1511,8 +1523,6 @@ form.upgrade .hint {
|
|||
float: right;
|
||||
padding: 0 8px 0 12px;
|
||||
overflow: auto;
|
||||
border-left-width: 1px;
|
||||
border-left-style: solid;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -698,48 +698,52 @@ final class WP_Screen {
|
|||
// Time to render!
|
||||
?>
|
||||
<div id="screen-meta" class="metabox-prefs">
|
||||
|
||||
<div id="contextual-help-wrap" class="hidden">
|
||||
<div class="contextual-help-tabs">
|
||||
<ul>
|
||||
<?php foreach ( $this->_help_tabs as $i => $tab ):
|
||||
$link_id = "tab-link-{$tab['id']}";
|
||||
$panel_id = "tab-panel-{$tab['id']}";
|
||||
$classes = ( $i == 0 ) ? 'active' : '';
|
||||
?>
|
||||
|
||||
<li id="<?php echo esc_attr( $link_id ); ?>" class="<?php echo esc_attr( $classes ); ?>">
|
||||
<a href="<?php echo esc_url( "#$panel_id" ); ?>">
|
||||
<?php echo esc_html( $tab['title'] ); ?>
|
||||
</a>
|
||||
</li>
|
||||
<?php endforeach; ?>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<?php if ( ! empty( $this->_help_sidebar ) ) : ?>
|
||||
<div class="contextual-help-sidebar">
|
||||
<?php echo self::$this->_help_sidebar; ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="contextual-help-tabs-wrap">
|
||||
<?php foreach ( $this->_help_tabs as $i => $tab ):
|
||||
$panel_id = "tab-panel-{$tab['id']}";
|
||||
$classes = ( $i == 0 ) ? 'active' : '';
|
||||
$classes .= ' help-tab-content';
|
||||
?>
|
||||
|
||||
<div id="<?php echo esc_attr( $panel_id ); ?>" class="<?php echo esc_attr( $classes ); ?>">
|
||||
<?php
|
||||
// Print tab content.
|
||||
echo $tab['content'];
|
||||
|
||||
// If it exists, fire tab callback.
|
||||
if ( ! empty( $tab['callback'] ) )
|
||||
call_user_func_array( $tab['callback'], array( $this, $tab ) );
|
||||
<div id="contextual-help-back"></div>
|
||||
<div id="contextual-help-columns">
|
||||
<div class="contextual-help-tabs">
|
||||
<ul>
|
||||
<?php foreach ( $this->_help_tabs as $i => $tab ):
|
||||
$link_id = "tab-link-{$tab['id']}";
|
||||
$panel_id = "tab-panel-{$tab['id']}";
|
||||
$classes = ( $i == 0 ) ? 'active' : '';
|
||||
?>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
|
||||
<li id="<?php echo esc_attr( $link_id ); ?>" class="<?php echo esc_attr( $classes ); ?>">
|
||||
<a href="<?php echo esc_url( "#$panel_id" ); ?>">
|
||||
<?php echo esc_html( $tab['title'] ); ?>
|
||||
</a>
|
||||
</li>
|
||||
<?php endforeach; ?>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<?php if ( ! empty( $this->_help_sidebar ) ) : ?>
|
||||
<div class="contextual-help-sidebar">
|
||||
<?php echo self::$this->_help_sidebar; ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="contextual-help-tabs-wrap">
|
||||
<?php foreach ( $this->_help_tabs as $i => $tab ):
|
||||
$panel_id = "tab-panel-{$tab['id']}";
|
||||
$classes = ( $i == 0 ) ? 'active' : '';
|
||||
$classes .= ' help-tab-content';
|
||||
?>
|
||||
|
||||
<div id="<?php echo esc_attr( $panel_id ); ?>" class="<?php echo esc_attr( $classes ); ?>">
|
||||
<?php
|
||||
// Print tab content.
|
||||
echo $tab['content'];
|
||||
|
||||
// If it exists, fire tab callback.
|
||||
if ( ! empty( $tab['callback'] ) )
|
||||
call_user_func_array( $tab['callback'], array( $this, $tab ) );
|
||||
?>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php
|
||||
|
|
|
|||
|
|
@ -93,8 +93,6 @@ screenMeta = {
|
|||
element: null, // #screen-meta
|
||||
toggles: null, // .screen-meta-toggle
|
||||
page: null, // #wpcontent
|
||||
padding: null, // the closed page padding-top property
|
||||
top: null, // the closed element top property
|
||||
|
||||
init: function() {
|
||||
this.element = $('#screen-meta');
|
||||
|
|
@ -124,24 +122,9 @@ screenMeta = {
|
|||
panel.parent().show();
|
||||
panel.slideDown( 'fast', function() {
|
||||
link.addClass('screen-meta-active');
|
||||
screenMeta.refresh();
|
||||
});
|
||||
},
|
||||
|
||||
refresh: function( panel, link ) {
|
||||
var columns = $('#contextual-help-wrap').children(), height = 0;
|
||||
|
||||
columns.each(function(){
|
||||
var h = $(this).height();
|
||||
|
||||
if ( h > height )
|
||||
height = h;
|
||||
});
|
||||
|
||||
if ( height )
|
||||
columns.height( height );
|
||||
},
|
||||
|
||||
close: function( panel, link ) {
|
||||
panel.slideUp( 'fast', function() {
|
||||
link.removeClass('screen-meta-active');
|
||||
|
|
@ -173,9 +156,6 @@ $('.contextual-help-tabs').delegate('a', 'click focus', function(e) {
|
|||
// Panels
|
||||
$('.help-tab-content').not( panel ).removeClass('active').hide();
|
||||
panel.addClass('active').show();
|
||||
|
||||
// Refresh the padding of the screen meta box.
|
||||
screenMeta.refresh();
|
||||
});
|
||||
|
||||
$(document).ready( function() {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -61,7 +61,7 @@ function wp_default_scripts( &$scripts ) {
|
|||
|
||||
$scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20101110' );
|
||||
|
||||
$scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20111106a', 1 );
|
||||
$scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20111119', 1 );
|
||||
$scripts->localize( 'common', 'commonL10n', array(
|
||||
'warnDelete' => __("You are about to permanently delete the selected items.\n 'Cancel' to stop, 'OK' to delete.")
|
||||
) );
|
||||
|
|
@ -433,13 +433,13 @@ 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(), '20111118c' );
|
||||
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20111119' );
|
||||
|
||||
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20111015' );
|
||||
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
|
||||
|
||||
// all colors stylesheets need to have the same query strings (cache manifest compat)
|
||||
$colors_version = '20111117';
|
||||
$colors_version = '20111119';
|
||||
|
||||
// Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
|
||||
$styles->add( 'colors', true, array('wp-admin'), $colors_version );
|
||||
|
|
|
|||
Loading…
Reference in New Issue