Generalize seletion for h2 and h3 tabs. Props chrisbliss18 fixes #15154

git-svn-id: http://svn.automattic.com/wordpress/trunk@15962 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-10-25 20:45:58 +00:00
parent ee1ba7f2f3
commit da54089621
9 changed files with 9 additions and 9 deletions

File diff suppressed because one or more lines are too long

View File

@ -3816,7 +3816,7 @@ div#custom-background-image img {
color: #464646; color: #464646;
} }
.themes-php .wrap h2, .theme-install-php .wrap h2, .site-info-php .wrap h3, .site-options-php .wrap h3, .site-users-php .wrap h3, .site-themes-php .wrap h3 { h2.nav-tab-wrapper, h3.nav-tab-wrapper {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
padding-bottom: 0; padding-bottom: 0;
} }

View File

@ -79,7 +79,7 @@ require('../admin-header.php');
<div class="wrap"> <div class="wrap">
<?php screen_icon('ms-admin'); ?> <?php screen_icon('ms-admin'); ?>
<h2 id="edit-site"><?php echo $title ?></h2> <h2 id="edit-site"><?php echo $title ?></h2>
<h3> <h3 class="nav-tab-wrapper">
<?php <?php
$tabs = array( 'site-info' => array( 'label' => __('Info'), 'url' => 'site-info.php'), 'site-options' => array( 'label' => __('Options'), 'url' => 'site-options.php'), $tabs = array( 'site-info' => array( 'label' => __('Info'), 'url' => 'site-info.php'), 'site-options' => array( 'label' => __('Options'), 'url' => 'site-options.php'),
'site-users' => array( 'label' => __('Users'), 'url' => 'site-users.php'), 'site-themes' => array( 'label' => __('Themes'), 'url' => 'site-themes.php')); 'site-users' => array( 'label' => __('Users'), 'url' => 'site-users.php'), 'site-themes' => array( 'label' => __('Themes'), 'url' => 'site-themes.php'));

View File

@ -67,7 +67,7 @@ require('../admin-header.php');
<div class="wrap"> <div class="wrap">
<?php screen_icon('ms-admin'); ?> <?php screen_icon('ms-admin'); ?>
<h2 id="edit-site"><?php echo $title ?></h2> <h2 id="edit-site"><?php echo $title ?></h2>
<h3> <h3 class="nav-tab-wrapper">
<?php <?php
$tabs = array( 'site-info' => array( 'label' => __('Info'), 'url' => 'site-info.php'), 'site-options' => array( 'label' => __('Options'), 'url' => 'site-options.php'), $tabs = array( 'site-info' => array( 'label' => __('Info'), 'url' => 'site-info.php'), 'site-options' => array( 'label' => __('Options'), 'url' => 'site-options.php'),
'site-users' => array( 'label' => __('Users'), 'url' => 'site-users.php'), 'site-themes' => array( 'label' => __('Themes'), 'url' => 'site-themes.php')); 'site-users' => array( 'label' => __('Users'), 'url' => 'site-users.php'), 'site-themes' => array( 'label' => __('Themes'), 'url' => 'site-themes.php'));

View File

@ -63,7 +63,7 @@ require('../admin-header.php');
<div class="wrap"> <div class="wrap">
<?php screen_icon('ms-admin'); ?> <?php screen_icon('ms-admin'); ?>
<h2 id="edit-site"><?php echo $title ?></h2> <h2 id="edit-site"><?php echo $title ?></h2>
<h3> <h3 class="nav-tab-wrapper">
<?php <?php
$tabs = array( 'site-info' => array( 'label' => __('Info'), 'url' => 'site-info.php'), 'site-options' => array( 'label' => __('Options'), 'url' => 'site-options.php'), $tabs = array( 'site-info' => array( 'label' => __('Info'), 'url' => 'site-info.php'), 'site-options' => array( 'label' => __('Options'), 'url' => 'site-options.php'),
'site-users' => array( 'label' => __('Users'), 'url' => 'site-users.php'), 'site-themes' => array( 'label' => __('Themes'), 'url' => 'site-themes.php')); 'site-users' => array( 'label' => __('Users'), 'url' => 'site-users.php'), 'site-themes' => array( 'label' => __('Themes'), 'url' => 'site-themes.php'));

View File

@ -111,7 +111,7 @@ require('../admin-header.php');
<div class="wrap"> <div class="wrap">
<?php screen_icon('ms-admin'); ?> <?php screen_icon('ms-admin'); ?>
<h2 id="edit-site"><?php echo $title ?></h2> <h2 id="edit-site"><?php echo $title ?></h2>
<h3> <h3 class="nav-tab-wrapper">
<?php <?php
$tabs = array( 'site-info' => array( 'label' => __('Info'), 'url' => 'site-info.php'), 'site-options' => array( 'label' => __('Options'), 'url' => 'site-options.php'), $tabs = array( 'site-info' => array( 'label' => __('Info'), 'url' => 'site-info.php'), 'site-options' => array( 'label' => __('Options'), 'url' => 'site-options.php'),
'site-users' => array( 'label' => __('Users'), 'url' => 'site-users.php'), 'site-themes' => array( 'label' => __('Themes'), 'url' => 'site-themes.php')); 'site-users' => array( 'label' => __('Users'), 'url' => 'site-users.php'), 'site-themes' => array( 'label' => __('Themes'), 'url' => 'site-themes.php'));

View File

@ -45,7 +45,7 @@ screen_icon();
if ( is_network_admin() ) : ?> if ( is_network_admin() ) : ?>
<h2><?php echo esc_html( $title ); ?></h2> <h2><?php echo esc_html( $title ); ?></h2>
<?php else : ?> <?php else : ?>
<h2><a href="themes.php" class="nav-tab"><?php echo esc_html_x('Manage Themes', 'theme'); ?></a><a href="theme-install.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a></h2> <h2 class="nav-tab-wrapper"><a href="themes.php" class="nav-tab"><?php echo esc_html_x('Manage Themes', 'theme'); ?></a><a href="theme-install.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a></h2>
<?php <?php
endif; endif;

View File

@ -69,7 +69,7 @@ require_once('./admin-header.php');
<div class="wrap"> <div class="wrap">
<?php screen_icon(); ?> <?php screen_icon(); ?>
<h2><a href="themes.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a><?php if ( current_user_can('install_themes') ) { ?><a href="theme-install.php" class="nav-tab"><?php echo esc_html_x('Install Themes', 'theme'); ?></a><?php } ?></h2> <h2 class="nav-tab-wrapper"><a href="themes.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a><?php if ( current_user_can('install_themes') ) { ?><a href="theme-install.php" class="nav-tab"><?php echo esc_html_x('Install Themes', 'theme'); ?></a><?php } ?></h2>
<h3><?php _e('Current Theme'); ?></h3> <h3><?php _e('Current Theme'); ?></h3>
<div id="current-theme"> <div id="current-theme">

View File

@ -454,7 +454,7 @@ 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(), '20101024' ); $styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20101025' );
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20101004' ); $styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20101004' );
$styles->add_data( 'ie', 'conditional', 'lte IE 7' ); $styles->add_data( 'ie', 'conditional', 'lte IE 7' );