mirror of
git://develop.git.wordpress.org/
synced 2025-02-27 10:02:43 +01:00
Help tabs: remove scrollbar and max-height. see #19155.
git-svn-id: https://develop.svn.wordpress.org/trunk@19361 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
e0d1c530da
commit
2ac5299c17
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 );
|
box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#contextual-help-back {
|
||||||
|
background: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
.contextual-help-tabs a:hover {
|
.contextual-help-tabs a:hover {
|
||||||
background-color: #ceeaff;
|
background-color: #ceeaff;
|
||||||
color: #333;
|
color: #333;
|
||||||
}
|
}
|
||||||
|
|
||||||
.contextual-help-sidebar,
|
#contextual-help-back,
|
||||||
.contextual-help-tabs .active {
|
.contextual-help-tabs .active {
|
||||||
border-color: #D1E5EE;
|
border-color: #D1E5EE;
|
||||||
}
|
}
|
||||||
@ -1663,12 +1667,6 @@ table.diff .diff-addedline ins {
|
|||||||
color: #000;
|
color: #000;
|
||||||
}
|
}
|
||||||
|
|
||||||
.contextual-help-tabs-wrap {
|
|
||||||
border-color: #D1E5EE;
|
|
||||||
border-right: 0;
|
|
||||||
background-color: #fff;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* screen options and help tabs */
|
/* screen options and help tabs */
|
||||||
#screen-options-link-wrap,
|
#screen-options-link-wrap,
|
||||||
#contextual-help-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 );
|
box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.05 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#contextual-help-back {
|
||||||
|
background: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
.contextual-help-tabs a:hover {
|
.contextual-help-tabs a:hover {
|
||||||
color: #333;
|
color: #333;
|
||||||
}
|
}
|
||||||
|
|
||||||
.contextual-help-sidebar,
|
#contextual-help-back,
|
||||||
.contextual-help-tabs .active {
|
.contextual-help-tabs .active {
|
||||||
border-color: #ccc;
|
border-color: #ccc;
|
||||||
}
|
}
|
||||||
@ -803,11 +807,6 @@ table.widefat span.spam a,
|
|||||||
color: #000;
|
color: #000;
|
||||||
}
|
}
|
||||||
|
|
||||||
.contextual-help-tabs-wrap {
|
|
||||||
border-color: #ccc;
|
|
||||||
background-color: #fff;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* screen options and help tabs */
|
/* screen options and help tabs */
|
||||||
#screen-options-link-wrap,
|
#screen-options-link-wrap,
|
||||||
#contextual-help-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 {
|
#contextual-help-wrap {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 8px 20px 12px;
|
padding: 8px 20px 12px;
|
||||||
max-height: 300px;
|
|
||||||
position: relative;
|
position: relative;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
}
|
}
|
||||||
@ -1370,6 +1369,7 @@ form.upgrade .hint {
|
|||||||
/* screen options and help tabs revert */
|
/* screen options and help tabs revert */
|
||||||
#screen-meta {
|
#screen-meta {
|
||||||
display: none;
|
display: none;
|
||||||
|
position: relative;
|
||||||
margin: 0 15px 0 5px;
|
margin: 0 15px 0 5px;
|
||||||
border-width: 0 1px 1px;
|
border-width: 0 1px 1px;
|
||||||
border-style: none solid solid;
|
border-style: none solid solid;
|
||||||
@ -1452,6 +1452,20 @@ form.upgrade .hint {
|
|||||||
margin-left: -4px;
|
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 {
|
.contextual-help-tabs {
|
||||||
float: left;
|
float: left;
|
||||||
width: 150px;
|
width: 150px;
|
||||||
@ -1487,8 +1501,6 @@ form.upgrade .hint {
|
|||||||
.contextual-help-tabs-wrap {
|
.contextual-help-tabs-wrap {
|
||||||
padding: 0 20px;
|
padding: 0 20px;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
border-left-width: 1px;
|
|
||||||
border-left-style: solid;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.help-tab-content {
|
.help-tab-content {
|
||||||
@ -1511,8 +1523,6 @@ form.upgrade .hint {
|
|||||||
float: right;
|
float: right;
|
||||||
padding: 0 8px 0 12px;
|
padding: 0 8px 0 12px;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
border-left-width: 1px;
|
|
||||||
border-left-style: solid;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -698,7 +698,10 @@ final class WP_Screen {
|
|||||||
// 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="hidden">
|
||||||
|
<div id="contextual-help-back"></div>
|
||||||
|
<div id="contextual-help-columns">
|
||||||
<div class="contextual-help-tabs">
|
<div class="contextual-help-tabs">
|
||||||
<ul>
|
<ul>
|
||||||
<?php foreach ( $this->_help_tabs as $i => $tab ):
|
<?php foreach ( $this->_help_tabs as $i => $tab ):
|
||||||
@ -742,6 +745,7 @@ final class WP_Screen {
|
|||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
<?php
|
<?php
|
||||||
// Add screen options
|
// Add screen options
|
||||||
if ( $this->show_screen_options() )
|
if ( $this->show_screen_options() )
|
||||||
|
@ -93,8 +93,6 @@ screenMeta = {
|
|||||||
element: null, // #screen-meta
|
element: null, // #screen-meta
|
||||||
toggles: null, // .screen-meta-toggle
|
toggles: null, // .screen-meta-toggle
|
||||||
page: null, // #wpcontent
|
page: null, // #wpcontent
|
||||||
padding: null, // the closed page padding-top property
|
|
||||||
top: null, // the closed element top property
|
|
||||||
|
|
||||||
init: function() {
|
init: function() {
|
||||||
this.element = $('#screen-meta');
|
this.element = $('#screen-meta');
|
||||||
@ -124,24 +122,9 @@ screenMeta = {
|
|||||||
panel.parent().show();
|
panel.parent().show();
|
||||||
panel.slideDown( 'fast', function() {
|
panel.slideDown( 'fast', function() {
|
||||||
link.addClass('screen-meta-active');
|
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 ) {
|
close: function( panel, link ) {
|
||||||
panel.slideUp( 'fast', function() {
|
panel.slideUp( 'fast', function() {
|
||||||
link.removeClass('screen-meta-active');
|
link.removeClass('screen-meta-active');
|
||||||
@ -173,9 +156,6 @@ $('.contextual-help-tabs').delegate('a', 'click focus', function(e) {
|
|||||||
// Panels
|
// Panels
|
||||||
$('.help-tab-content').not( panel ).removeClass('active').hide();
|
$('.help-tab-content').not( panel ).removeClass('active').hide();
|
||||||
panel.addClass('active').show();
|
panel.addClass('active').show();
|
||||||
|
|
||||||
// Refresh the padding of the screen meta box.
|
|
||||||
screenMeta.refresh();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
$(document).ready( function() {
|
$(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( '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(
|
$scripts->localize( 'common', 'commonL10n', array(
|
||||||
'warnDelete' => __("You are about to permanently delete the selected items.\n 'Cancel' to stop, 'OK' to delete.")
|
'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
|
// 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(), '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( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20111015' );
|
||||||
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
|
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
|
||||||
|
|
||||||
// all colors stylesheets need to have the same query strings (cache manifest compat)
|
// 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.
|
// 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 );
|
$styles->add( 'colors', true, array('wp-admin'), $colors_version );
|
||||||
|
Loading…
x
Reference in New Issue
Block a user