WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert [17943] as it breaks plugins, props johnjamesjacoby, fixes #17484 

git-svn-id: http://svn.automattic.com/wordpress/trunk@17950 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-05-18 06:20:30 +00:00
parent 24f315692d
commit d2e54b7932
9 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/css/colors-classic.css
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/colors-classic.dev.css
View File

@ -1261,7 +1261,7 @@ table.widefat .spam a:hover,
border-color: #bed1dd; border-color: #bed1dd;
} }
#adminmenu a.separator { #adminmenu div.separator {
border-color: #D1E5EE; border-color: #D1E5EE;
} }

2
wp-admin/css/colors-fresh.css
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/colors-fresh.dev.css
View File

@ -1261,7 +1261,7 @@ table.widefat .spam a:hover,
border-color: #cfcfcf; border-color: #cfcfcf;
} }
#adminmenu a.separator { #adminmenu div.separator {
border-color: #e1e1e1; border-color: #e1e1e1;
} }

2
wp-admin/css/wp-admin.css
View File

File diff suppressed because one or more lines are too long

3
wp-admin/css/wp-admin.dev.css
View File

@ -1328,9 +1328,10 @@ body.no-js #adminmenu li.wp-has-current-submenu .wp-submenu {
margin: 0; margin: 0;
border-width: 1px 0; border-width: 1px 0;
border-style: solid; border-style: solid;
cursor: inherit;
} }
#adminmenu a.separator { #adminmenu div.separator {
height: 1px; height: 1px;
padding: 0; padding: 0;
border-width: 1px 0 0 0; border-width: 1px 0 0 0;

4
wp-admin/menu-header.php
View File

@ -82,7 +82,9 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
echo "\n\t<li$class$id>"; echo "\n\t<li$class$id>";
if ( $submenu_as_parent && !empty($submenu[$item[2]]) ) { if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
echo '<div class="separator"></div>';
} elseif ( $submenu_as_parent && !empty($submenu[$item[2]]) ) {
$submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index. $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
$menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]); $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
$menu_file = $submenu[$item[2]][0][2]; $menu_file = $submenu[$item[2]][0][2];

6
wp-admin/menu.php
View File

@ -69,7 +69,7 @@ if ( ! is_multisite() ) {
unset($theme_update_count, $wordpress_update_count, $update_themes, $update_plugins, $update_wordpress); unset($theme_update_count, $wordpress_update_count, $update_themes, $update_plugins, $update_wordpress);
$menu[4] = array( '', 'read', '', '', 'wp-menu-separator' ); $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
$menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'div' ); $menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'div' );
$submenu['edit.php'][5] = array( __('All Posts'), 'edit_posts', 'edit.php' ); $submenu['edit.php'][5] = array( __('All Posts'), 'edit_posts', 'edit.php' );
@ -152,7 +152,7 @@ foreach ( (array) get_post_types( array('show_ui' => true, '_builtin' => false,
} }
unset($ptype, $ptype_obj, $ptype_class, $ptype_for_id, $ptype_menu_position, $menu_icon, $i, $tax); unset($ptype, $ptype_obj, $ptype_class, $ptype_for_id, $ptype_menu_position, $menu_icon, $i, $tax);
$menu[59] = array( '', 'read', '', '', 'wp-menu-separator' ); $menu[59] = array( '', 'read', 'separator2', '', 'wp-menu-separator' );
if ( current_user_can( 'switch_themes') ) { if ( current_user_can( 'switch_themes') ) {
$menu[60] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' ); $menu[60] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div' );
@ -232,7 +232,7 @@ $menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '',
$_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group $_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group
$menu[99] = array( '', 'read', '', '', 'wp-menu-separator-last' ); $menu[99] = array( '', 'read', 'separator-last', '', 'wp-menu-separator-last' );
// Back-compat for old top-levels // Back-compat for old top-levels
$_wp_real_parent_file['post.php'] = 'edit.php'; $_wp_real_parent_file['post.php'] = 'edit.php';

4
wp-includes/script-loader.php
View File

@ -482,13 +482,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(), '20110517' ); $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20110517a' );
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20101102' ); $styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20101102' );
$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 = '20110516'; $colors_version = '20110517';
// 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(), $colors_version ); $styles->add( 'colors', true, array(), $colors_version );