mirror of
https://github.com/WordPress/WordPress.git
synced 2024-12-31 13:37:51 +01:00
Admin Header 2: The Return of 32px Icons. Props, iammattthomas. see #17324.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17872 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
koopersmith
parent
071148d178
commit
2207bfe689
File diff suppressed because one or more lines are too long
@ -178,6 +178,11 @@ strong .post-com-count span {
|
||||
.wrap h2 {
|
||||
color: #464646;
|
||||
}
|
||||
|
||||
.wrap .add-new-h2 {
|
||||
background: #f1f1f1;
|
||||
}
|
||||
|
||||
.subtitle {
|
||||
color: #999;
|
||||
}
|
||||
@ -749,12 +754,12 @@ table.widefat span.spam a,
|
||||
}
|
||||
|
||||
#user_info_arrow {
|
||||
background: transparent url(../images/arrows.png) no-repeat 6px 6px;
|
||||
background: transparent url(../images/arrows.png) no-repeat 6px 5px;
|
||||
}
|
||||
|
||||
#user_info:hover #user_info_arrow,
|
||||
#user_info.active #user_info_arrow {
|
||||
background: transparent url(../images/arrows-dark.png) no-repeat 6px 6px;
|
||||
background: transparent url(../images/arrows-dark.png) no-repeat 6px 5px;
|
||||
}
|
||||
|
||||
#user_info_links {
|
||||
@ -1314,7 +1319,6 @@ table.widefat .spam a:hover,
|
||||
}
|
||||
|
||||
/* menu and screen icons */
|
||||
#icon-index,
|
||||
#adminmenu .menu-icon-dashboard div.wp-menu-image {
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -61px -33px;
|
||||
}
|
||||
@ -1325,8 +1329,6 @@ table.widefat .spam a:hover,
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -61px -1px;
|
||||
}
|
||||
|
||||
#icon-edit,
|
||||
#icon-post,
|
||||
#adminmenu .menu-icon-post div.wp-menu-image {
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -272px -33px;
|
||||
}
|
||||
@ -1336,7 +1338,6 @@ table.widefat .spam a:hover,
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -272px -1px;
|
||||
}
|
||||
|
||||
#icon-upload,
|
||||
#adminmenu .menu-icon-media div.wp-menu-image {
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -121px -33px;
|
||||
}
|
||||
@ -1346,9 +1347,6 @@ table.widefat .spam a:hover,
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -121px -1px;
|
||||
}
|
||||
|
||||
#icon-link,
|
||||
#icon-link-manager,
|
||||
#icon-link-category,
|
||||
#adminmenu .menu-icon-links div.wp-menu-image {
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -91px -33px;
|
||||
}
|
||||
@ -1358,8 +1356,6 @@ table.widefat .spam a:hover,
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -91px -1px;
|
||||
}
|
||||
|
||||
#icon-page,
|
||||
#icon-edit-pages,
|
||||
#adminmenu .menu-icon-page div.wp-menu-image {
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -151px -33px;
|
||||
}
|
||||
@ -1369,7 +1365,6 @@ table.widefat .spam a:hover,
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -151px -1px;
|
||||
}
|
||||
|
||||
#icon-edit-comments,
|
||||
#adminmenu .menu-icon-comments div.wp-menu-image {
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -31px -33px;
|
||||
}
|
||||
@ -1380,7 +1375,6 @@ table.widefat .spam a:hover,
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -31px -1px;
|
||||
}
|
||||
|
||||
#icon-themes,
|
||||
#adminmenu .menu-icon-appearance div.wp-menu-image {
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -1px -33px;
|
||||
}
|
||||
@ -1390,7 +1384,6 @@ table.widefat .spam a:hover,
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -1px -1px;
|
||||
}
|
||||
|
||||
#icon-plugins,
|
||||
#adminmenu .menu-icon-plugins div.wp-menu-image {
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -181px -33px;
|
||||
}
|
||||
@ -1400,9 +1393,6 @@ table.widefat .spam a:hover,
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -181px -1px;
|
||||
}
|
||||
|
||||
#icon-users,
|
||||
#icon-profile,
|
||||
#icon-user-edit,
|
||||
#adminmenu .menu-icon-users div.wp-menu-image {
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -301px -33px;
|
||||
}
|
||||
@ -1412,8 +1402,6 @@ table.widefat .spam a:hover,
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -301px -1px;
|
||||
}
|
||||
|
||||
#icon-tools,
|
||||
#icon-admin,
|
||||
#adminmenu .menu-icon-tools div.wp-menu-image {
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -211px -33px;
|
||||
}
|
||||
@ -1433,7 +1421,6 @@ table.widefat .spam a:hover,
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -241px -1px;
|
||||
}
|
||||
|
||||
#icon-ms-admin,
|
||||
#adminmenu .menu-icon-site div.wp-menu-image {
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -361px -33px;
|
||||
}
|
||||
@ -1442,9 +1429,65 @@ table.widefat .spam a:hover,
|
||||
#adminmenu .menu-icon-site.wp-has-current-submenu div.wp-menu-image {
|
||||
background: transparent url('../images/menu.png?ver=20100531') no-repeat scroll -361px -1px;
|
||||
}
|
||||
|
||||
/* end menu and screen icons */
|
||||
|
||||
/* Screen Icons */
|
||||
#icon-edit,
|
||||
#icon-post {
|
||||
background: transparent url(../images/icons32.png?ver=20100531) no-repeat -552px -5px;
|
||||
}
|
||||
|
||||
#icon-index {
|
||||
background: transparent url(../images/icons32.png?ver=20100531) no-repeat -137px -5px;
|
||||
}
|
||||
|
||||
#icon-upload {
|
||||
background: transparent url(../images/icons32.png?ver=20100531) no-repeat -251px -5px;
|
||||
}
|
||||
|
||||
#icon-link-manager,
|
||||
#icon-link,
|
||||
#icon-link-category {
|
||||
background: transparent url(../images/icons32.png?ver=20100531) no-repeat -190px -5px;
|
||||
}
|
||||
|
||||
#icon-edit-pages,
|
||||
#icon-page {
|
||||
background: transparent url(../images/icons32.png?ver=20100531) no-repeat -312px -5px;
|
||||
}
|
||||
|
||||
#icon-edit-comments {
|
||||
background: transparent url(../images/icons32.png?ver=20100531) no-repeat -72px -5px;
|
||||
}
|
||||
|
||||
#icon-themes {
|
||||
background: transparent url(../images/icons32.png?ver=20100531) no-repeat -11px -5px;
|
||||
}
|
||||
|
||||
#icon-plugins {
|
||||
background: transparent url(../images/icons32.png?ver=20100531) no-repeat -370px -5px;
|
||||
}
|
||||
|
||||
#icon-users,
|
||||
#icon-profile,
|
||||
#icon-user-edit {
|
||||
background: transparent url(../images/icons32.png?ver=20100531) no-repeat -600px -5px;
|
||||
}
|
||||
|
||||
#icon-tools,
|
||||
#icon-admin {
|
||||
background: transparent url(../images/icons32.png?ver=20100531) no-repeat -432px -5px;
|
||||
}
|
||||
|
||||
#icon-options-general {
|
||||
background: transparent url(../images/icons32.png?ver=20100531) no-repeat -492px -5px;
|
||||
}
|
||||
|
||||
#icon-ms-admin {
|
||||
background: transparent url(../images/icons32.png?ver=20100531) no-repeat -659px -5px;
|
||||
}
|
||||
/* end screen icons */
|
||||
|
||||
|
||||
/* Diff */
|
||||
table.diff .diff-deletedline {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -525,18 +525,25 @@ div.error p {
|
||||
text-shadow: rgba(255,255,255,1) 0 1px 0;
|
||||
}
|
||||
.wrap h2 {
|
||||
font-size: 20px;
|
||||
padding: 7px 15px 3px 0;
|
||||
line-height: 28px;
|
||||
font-size: 23px;
|
||||
padding: 9px 15px 4px 0;
|
||||
line-height: 29px;
|
||||
}
|
||||
.subtitle {
|
||||
font-size: 14px;
|
||||
}
|
||||
.wrap .add-new-h2 {
|
||||
position: relative;
|
||||
top: -2px;
|
||||
margin-left: 2px;
|
||||
font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
|
||||
margin-left: 4px;
|
||||
padding: 3px 8px;
|
||||
position: relative;
|
||||
top: -3px;
|
||||
-moz-border-radius: 3px;
|
||||
-khtml-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
text-decoration: none;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.wrap h2.long-header {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -81,9 +81,9 @@ kbd, code {
|
||||
|
||||
.icon32 {
|
||||
float: left;
|
||||
height: 28px;
|
||||
margin: 6px 1px 0 -5px;
|
||||
width: 28px;
|
||||
height: 34px;
|
||||
margin: 7px 8px 0 0;
|
||||
width: 36px;
|
||||
}
|
||||
|
||||
.key-labels label {
|
||||
@ -834,24 +834,33 @@ form.upgrade .hint {
|
||||
#user_info {
|
||||
float: right;
|
||||
font-size: 12px;
|
||||
line-height: 36px;
|
||||
height: 36px;
|
||||
line-height: 26px;
|
||||
height: 25px;
|
||||
position: relative;
|
||||
z-index: 49;
|
||||
border-style: solid;
|
||||
border-width: 0;
|
||||
margin-top: 3px;
|
||||
padding: 0 2px 0 6px;
|
||||
}
|
||||
|
||||
#user_info.active {
|
||||
border-width: 0 1px;
|
||||
border-width: 1px;
|
||||
margin-right: -1px;
|
||||
margin-top: 2px;
|
||||
-moz-border-radius: 3px 3px 0 0;
|
||||
-webkit-border-top-right-radius: 3px;
|
||||
-webkit-border-top-left-radius: 3px;
|
||||
-khtml-border-top-right-radius: 3px;
|
||||
-khtml-border-top-left-radius: 3px;
|
||||
border-top-right-radius: 3px;
|
||||
border-top-left-radius: 3px;
|
||||
}
|
||||
|
||||
#user_info p {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
line-height: 36px;
|
||||
line-height: 25px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
@ -867,11 +876,11 @@ form.upgrade .hint {
|
||||
}
|
||||
|
||||
#user_info_arrow {
|
||||
height: 34px;
|
||||
width: 24px;
|
||||
height: 22px;
|
||||
width: 22px;
|
||||
position: absolute;
|
||||
right: 1px;
|
||||
top: 4px;
|
||||
right: 3px;
|
||||
top: 0;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
@ -879,7 +888,7 @@ form.upgrade .hint {
|
||||
min-width: 100px;
|
||||
width: 100%;
|
||||
position: absolute;
|
||||
top: 36px;
|
||||
top: 25px;
|
||||
right: 0;
|
||||
padding: 0;
|
||||
text-shadow: rgba(255,255,255,0.7) 0 1px 0;
|
||||
@ -933,8 +942,9 @@ form.upgrade .hint {
|
||||
}
|
||||
|
||||
#wphead {
|
||||
height: 36px;
|
||||
height: 32px;
|
||||
margin-right: 15px;
|
||||
margin-left: 2px;
|
||||
}
|
||||
|
||||
#wphead a,
|
||||
@ -948,7 +958,7 @@ form.upgrade .hint {
|
||||
|
||||
#header-logo {
|
||||
float: left;
|
||||
margin: 9px 0;
|
||||
margin: 7px 0;
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-khtml-user-select: none;
|
||||
@ -956,8 +966,8 @@ form.upgrade .hint {
|
||||
}
|
||||
|
||||
#wphead h1 {
|
||||
font: normal 18px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
|
||||
padding: 7px 8px 5px;
|
||||
font: normal 16px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
|
||||
padding: 6px 8px 5px;
|
||||
margin: 0;
|
||||
float: left;
|
||||
}
|
||||
@ -1057,7 +1067,7 @@ form.upgrade .hint {
|
||||
}
|
||||
|
||||
#screen-meta-links {
|
||||
margin: 0 15px 0 0;
|
||||
margin: 0 19px 0 0;
|
||||
}
|
||||
|
||||
#screen-meta .screen-reader-text {
|
||||
@ -4065,7 +4075,7 @@ h2.nav-tab-wrapper, h3.nav-tab-wrapper {
|
||||
}
|
||||
|
||||
h2 .nav-tab {
|
||||
padding: 2px 10px 3px;
|
||||
padding: 4px 10px 6px;
|
||||
font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-weight: 200;
|
||||
font-size: 20px;
|
||||
|
||||
@ -190,7 +190,7 @@ require_once('./admin-header.php');
|
||||
?>
|
||||
<div class="wrap">
|
||||
<?php screen_icon(); ?>
|
||||
<h2><?php echo esc_html( $post_type_object->labels->name ); ?> <a href="<?php echo $post_new_file ?>" class="button add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a> <?php
|
||||
<h2><?php echo esc_html( $post_type_object->labels->name ); ?> <a href="<?php echo $post_new_file ?>" class="add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a> <?php
|
||||
if ( isset($_REQUEST['s']) && $_REQUEST['s'] )
|
||||
printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', get_search_query() ); ?>
|
||||
</h2>
|
||||
|
||||
@ -59,7 +59,7 @@ if ( ! current_user_can('manage_links') )
|
||||
|
||||
<div class="wrap nosubsub">
|
||||
<?php screen_icon(); ?>
|
||||
<h2><?php echo esc_html( $title ); ?> <a href="link-add.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php
|
||||
<h2><?php echo esc_html( $title ); ?> <a href="link-add.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php
|
||||
if ( !empty($_REQUEST['s']) )
|
||||
printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( stripslashes($_REQUEST['s']) ) ); ?>
|
||||
</h2>
|
||||
|
||||
@ -102,7 +102,7 @@ require_once( '../admin-header.php' );
|
||||
<h2><?php _e('Sites') ?>
|
||||
<?php echo $msg; ?>
|
||||
<?php if ( current_user_can( 'create_sites') ) : ?>
|
||||
<a href="<?php echo network_admin_url('site-new.php'); ?>" class="button add-new-h2"><?php echo esc_html_x( 'Add New', 'site' ); ?></a>
|
||||
<a href="<?php echo network_admin_url('site-new.php'); ?>" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'site' ); ?></a>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] ) {
|
||||
|
||||
@ -199,7 +199,7 @@ require_once(ABSPATH . 'wp-admin/admin-header.php');
|
||||
|
||||
<div class="wrap">
|
||||
<?php screen_icon('themes'); ?>
|
||||
<h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
|
||||
<h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
|
||||
if ( $s )
|
||||
printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( $s ) ); ?>
|
||||
</h2>
|
||||
|
||||
@ -74,7 +74,7 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty(
|
||||
<?php screen_icon(); ?>
|
||||
<h2><?php esc_html_e( 'Users' );
|
||||
if ( current_user_can( 'create_users') ) : ?>
|
||||
<a href="<?php echo network_admin_url('user-new.php'); ?>" class="button add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php
|
||||
<a href="<?php echo network_admin_url('user-new.php'); ?>" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php
|
||||
endif;
|
||||
|
||||
if ( !empty( $usersearch ) )
|
||||
|
||||
@ -387,7 +387,7 @@ if ( !empty($invalid) )
|
||||
<?php screen_icon(); ?>
|
||||
<h2><?php echo esc_html( $title );
|
||||
if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?>
|
||||
<a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="button add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a>
|
||||
<a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a>
|
||||
<?php }
|
||||
if ( $s )
|
||||
printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( $s ) ); ?>
|
||||
|
||||
@ -160,7 +160,7 @@ require_once('./admin-header.php');
|
||||
|
||||
<div class="wrap">
|
||||
<?php screen_icon(); ?>
|
||||
<h2><?php echo esc_html( $title ); ?> <a href="media-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'file'); ?></a> <?php
|
||||
<h2><?php echo esc_html( $title ); ?> <a href="media-new.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'file'); ?></a> <?php
|
||||
if ( isset($_REQUEST['s']) && $_REQUEST['s'] )
|
||||
printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', get_search_query() ); ?>
|
||||
</h2>
|
||||
|
||||
@ -360,9 +360,9 @@ if ( ! empty($messages) ) {
|
||||
<?php
|
||||
echo esc_html( $title );
|
||||
if ( current_user_can( 'create_users' ) ) { ?>
|
||||
<a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
|
||||
<a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
|
||||
<?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
|
||||
<a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
|
||||
<a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
|
||||
<?php }
|
||||
|
||||
if ( $usersearch )
|
||||
|
||||
@ -487,13 +487,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(), '20110511i' );
|
||||
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20110511j' );
|
||||
|
||||
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20101102' );
|
||||
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
|
||||
|
||||
// all colors stylesheets need to have the same query strings (cache manifest compat)
|
||||
$colors_version = '20110511h';
|
||||
$colors_version = '20110511i';
|
||||
|
||||
// Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
|
||||
$styles->add( 'colors', true, array(), $colors_version );
|
||||
@ -503,7 +503,7 @@ function wp_default_styles( &$styles ) {
|
||||
$styles->add( 'colors-classic', "/wp-admin/css/colors-classic$suffix.css", array(), $colors_version );
|
||||
|
||||
$styles->add( 'ms', "/wp-admin/css/ms$suffix.css", array(), '20101213' );
|
||||
$styles->add( 'global', "/wp-admin/css/global$suffix.css", array(), '20110511d' );
|
||||
$styles->add( 'global', "/wp-admin/css/global$suffix.css", array(), '20110511e' );
|
||||
$styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20110121' );
|
||||
$styles->add( 'widgets', "/wp-admin/css/widgets$suffix.css", array(), '20110511' );
|
||||
$styles->add( 'dashboard', "/wp-admin/css/dashboard$suffix.css", array(), '20110511b' );
|
||||
|
||||
Loading…
Reference in New Issue
Block a user