New super admin icons for the blue/classic color scheme from Ben Dunkle. Remove temp icons, implement the new ones. fixes #12374.

git-svn-id: http://svn.automattic.com/wordpress/trunk@14024 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-04-07 03:54:43 +00:00
parent 60a2fe8c44
commit c6ef197f53
8 changed files with 28 additions and 15 deletions

View File

@ -1245,6 +1245,15 @@ table.widefat .spam a:hover,
#adminmenu .menu-icon-settings.wp-has-current-submenu div.wp-menu-image { #adminmenu .menu-icon-settings.wp-has-current-submenu div.wp-menu-image {
background: transparent url('../images/menu-vs.png') no-repeat scroll -241px -1px; background: transparent url('../images/menu-vs.png') no-repeat scroll -241px -1px;
} }
#adminmenu .menu-icon-site div.wp-menu-image {
background: transparent url('../images/menu-vs.png') no-repeat scroll -361px -33px;
}
#adminmenu .menu-icon-site:hover div.wp-menu-image,
#adminmenu .menu-icon-site.wp-has-current-submenu div.wp-menu-image {
background: transparent url('../images/menu-vs.png') no-repeat scroll -361px -1px;
}
/* end menu */ /* end menu */
@ -1576,6 +1585,10 @@ fieldset.inline-edit-col-right .inline-edit-col {
background: transparent url(../images/icons32-vs.png) no-repeat -492px -5px; background: transparent url(../images/icons32-vs.png) no-repeat -492px -5px;
} }
#icon-ms-admin {
background: transparent url(../images/icons32-vs.png) no-repeat -659px -5px;
}
.view-switch #view-switch-list { .view-switch #view-switch-list {
background: transparent url(../images/list-vs.png) no-repeat 0 0; background: transparent url(../images/list-vs.png) no-repeat 0 0;
} }

View File

@ -1235,6 +1235,15 @@ table.widefat .spam a:hover,
#adminmenu .menu-icon-settings.wp-has-current-submenu div.wp-menu-image { #adminmenu .menu-icon-settings.wp-has-current-submenu div.wp-menu-image {
background: transparent url('../images/menu.png') no-repeat scroll -241px -1px; background: transparent url('../images/menu.png') no-repeat scroll -241px -1px;
} }
#adminmenu .menu-icon-site div.wp-menu-image {
background: transparent url('../images/menu.png') no-repeat scroll -361px -33px;
}
#adminmenu .menu-icon-site:hover div.wp-menu-image,
#adminmenu .menu-icon-site.wp-has-current-submenu div.wp-menu-image {
background: transparent url('../images/menu.png') no-repeat scroll -361px -1px;
}
/* end menu */ /* end menu */
@ -1555,6 +1564,10 @@ fieldset.inline-edit-col-right .inline-edit-col {
background: transparent url(../images/icons32.png) no-repeat -492px -5px; background: transparent url(../images/icons32.png) no-repeat -492px -5px;
} }
#icon-ms-admin {
background: transparent url(../images/icons32.png) no-repeat -659px -5px;
}
.view-switch #view-switch-list { .view-switch #view-switch-list {
background: transparent url(../images/list.png) no-repeat 0 0; background: transparent url(../images/list.png) no-repeat 0 0;
} }

View File

@ -1,12 +1,3 @@
/* Site Admin Menu */
#adminmenu .menu-icon-site div.wp-menu-image {
background: transparent url('../images/site-admin.png') no-repeat scroll 0px -33px;
}
#adminmenu .menu-icon-site:hover div.wp-menu-image {
background: transparent url('../images/site-admin.png') no-repeat scroll 0px -1px;
}
/* Dashboard: MS Specific Data */ /* Dashboard: MS Specific Data */
#dashboard_right_now p.musub { #dashboard_right_now p.musub {
margin-top: 12px; margin-top: 12px;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

View File

@ -3803,10 +3803,6 @@ function screen_icon($screen = '') {
else else
$name = $screen->base; $name = $screen->base;
// @todo Remove this once we have a site admin icon
if ( 'ms-admin' == $screen->parent_base )
$name = 'tools';
if ( 'edit' == $name && isset($screen->post_type) && 'page' == $screen->post_type ) if ( 'edit' == $name && isset($screen->post_type) && 'page' == $screen->post_type )
$name = 'edit-pages'; $name = 'edit-pages';
} }

View File

@ -441,7 +441,7 @@ function wp_default_styles( &$styles ) {
$no_suffix = array( 'farbtastic' ); $no_suffix = array( 'farbtastic' );
// 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 = '20100403b'; $colors_version = '20100406';
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20100403c' ); $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20100403c' );
@ -457,7 +457,7 @@ function wp_default_styles( &$styles ) {
$styles->add( 'colors-classic', "/wp-admin/css/colors-classic$suffix.css", array(), $colors_version ); $styles->add( 'colors-classic', "/wp-admin/css/colors-classic$suffix.css", array(), $colors_version );
$styles->add_data( 'colors-classic', 'rtl', true ); $styles->add_data( 'colors-classic', 'rtl', true );
$styles->add( 'ms', "/wp-admin/css/ms$suffix.css", array(), '2010040101' ); $styles->add( 'ms', "/wp-admin/css/ms$suffix.css", array(), '20100406' );
$styles->add( 'global', "/wp-admin/css/global$suffix.css", array(), '20100108' ); $styles->add( 'global', "/wp-admin/css/global$suffix.css", array(), '20100108' );
$styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20091029' ); $styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20091029' );
$styles->add( 'widgets', "/wp-admin/css/widgets$suffix.css", array(), '20091118' ); $styles->add( 'widgets', "/wp-admin/css/widgets$suffix.css", array(), '20091118' );