Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 17:48:01 +01:00
Code Issues Projects Releases Wiki Activity

Bump H3 headings to H2 on the Network Admin > Sites > Edit Site screens.

Browse Source 
The navigation tabs appear in an `<h3>` heading immediately following the main `<h1>` and need to have a proper hierarchy.
Also, fix the tabs focus style and introduce a new `.nav-tab-small` CSS class.

Fixes #34079.
Built from https://develop.svn.wordpress.org/trunk@34913


git-svn-id: http://core.svn.wordpress.org/trunk@34878 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrea Fercia 2015-10-07 17:35:24 +00:00
parent 9926983b66
commit 17f53091ed
9 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wp-admin/css/common-rtl.css
View File

@ -1960,15 +1960,20 @@ html.wp-toolbar {
border-bottom: none; border-bottom: none;
background: #e4e4e4; background: #e4e4e4;
color: #555; color: #555;
font-size: 12px;
line-height: 16px;
display: inline-block;
padding: 4px 14px 6px;
text-decoration: none;
margin: -4px 0 -1px 4px;
} }
.nav-tab:hover { .nav-tab,
.nav-tab-small .nav-tab {
display: inline-block;
margin: -4px 0 -1px 4px;
padding: 5px 14px;
font-size: 12px;
line-height: 16px;
text-decoration: none;
}
.nav-tab:hover,
.nav-tab:focus {
background-color: #fff; background-color: #fff;
color: #464646; color: #464646;
} }
@ -1978,7 +1983,8 @@ html.wp-toolbar {
} }
.nav-tab-active, .nav-tab-active,
.nav-tab-active:hover { .nav-tab-active:hover,
.nav-tab-active:focus {
border-bottom: 1px solid #f1f1f1; border-bottom: 1px solid #f1f1f1;
background: #f1f1f1; background: #f1f1f1;
color: #000; color: #000;
@ -1995,7 +2001,7 @@ h3.nav-tab-wrapper {
h1 .nav-tab, h1 .nav-tab,
h2 .nav-tab { h2 .nav-tab {
padding: 6px 10px; padding: 6px 10px;
font-weight: bold; font-weight: 600;
font-size: 15px; font-size: 15px;
line-height: 24px; line-height: 24px;
} }

24
wp-admin/css/common.css
View File

@ -1960,15 +1960,20 @@ html.wp-toolbar {
border-bottom: none; border-bottom: none;
background: #e4e4e4; background: #e4e4e4;
color: #555; color: #555;
font-size: 12px;
line-height: 16px;
display: inline-block;
padding: 4px 14px 6px;
text-decoration: none;
margin: -4px 4px -1px 0;
} }
.nav-tab:hover { .nav-tab,
.nav-tab-small .nav-tab {
display: inline-block;
margin: -4px 4px -1px 0;
padding: 5px 14px;
font-size: 12px;
line-height: 16px;
text-decoration: none;
}
.nav-tab:hover,
.nav-tab:focus {
background-color: #fff; background-color: #fff;
color: #464646; color: #464646;
} }
@ -1978,7 +1983,8 @@ html.wp-toolbar {
} }
.nav-tab-active, .nav-tab-active,
.nav-tab-active:hover { .nav-tab-active:hover,
.nav-tab-active:focus {
border-bottom: 1px solid #f1f1f1; border-bottom: 1px solid #f1f1f1;
background: #f1f1f1; background: #f1f1f1;
color: #000; color: #000;
@ -1995,7 +2001,7 @@ h3.nav-tab-wrapper {
h1 .nav-tab, h1 .nav-tab,
h2 .nav-tab { h2 .nav-tab {
padding: 6px 10px; padding: 6px 10px;
font-weight: bold; font-weight: 600;
font-size: 15px; font-size: 15px;
line-height: 24px; line-height: 24px;
} }

2
wp-admin/css/wp-admin-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

4
wp-admin/network/site-info.php
View File

@ -138,7 +138,7 @@ require( ABSPATH . 'wp-admin/admin-header.php' );
<div class="wrap"> <div class="wrap">
<h1 id="edit-site"><?php echo $title; ?></h1> <h1 id="edit-site"><?php echo $title; ?></h1>
<p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p> <p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
<h3 class="nav-tab-wrapper"> <h2 class="nav-tab-wrapper nav-tab-small">
<?php <?php
$tabs = array( $tabs = array(
'site-info' => array( 'label' => __( 'Info' ), 'url' => 'site-info.php' ), 'site-info' => array( 'label' => __( 'Info' ), 'url' => 'site-info.php' ),
@ -151,7 +151,7 @@ foreach ( $tabs as $tab_id => $tab ) {
echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>'; echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
} }
?> ?>
</h3> </h2>
<?php <?php
if ( ! empty( $messages ) ) { if ( ! empty( $messages ) ) {
foreach ( $messages as $msg ) { foreach ( $messages as $msg ) {

4
wp-admin/network/site-settings.php
View File

@ -95,7 +95,7 @@ require( ABSPATH . 'wp-admin/admin-header.php' );
<div class="wrap"> <div class="wrap">
<h1 id="edit-site"><?php echo $title; ?></h1> <h1 id="edit-site"><?php echo $title; ?></h1>
<p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p> <p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
<h3 class="nav-tab-wrapper"> <h2 class="nav-tab-wrapper nav-tab-small">
<?php <?php
$tabs = array( $tabs = array(
'site-info' => array( 'label' => __( 'Info' ), 'url' => 'site-info.php' ), 'site-info' => array( 'label' => __( 'Info' ), 'url' => 'site-info.php' ),
@ -108,7 +108,7 @@ foreach ( $tabs as $tab_id => $tab ) {
echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>'; echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
} }
?> ?>
</h3> </h2>
<?php <?php
if ( ! empty( $messages ) ) { if ( ! empty( $messages ) ) {
foreach ( $messages as $msg ) foreach ( $messages as $msg )

4
wp-admin/network/site-themes.php
View File

@ -149,7 +149,7 @@ require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
<div class="wrap"> <div class="wrap">
<h1 id="edit-site"><?php echo $title; ?></h1> <h1 id="edit-site"><?php echo $title; ?></h1>
<p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p> <p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
<h3 class="nav-tab-wrapper"> <h2 class="nav-tab-wrapper nav-tab-small">
<?php <?php
$tabs = array( $tabs = array(
'site-info' => array( 'label' => __( 'Info' ), 'url' => 'site-info.php' ), 'site-info' => array( 'label' => __( 'Info' ), 'url' => 'site-info.php' ),
@ -162,7 +162,7 @@ foreach ( $tabs as $tab_id => $tab ) {
echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>'; echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
} }
?> ?>
</h3><?php </h2><?php
if ( isset( $_GET['enabled'] ) ) { if ( isset( $_GET['enabled'] ) ) {
$enabled = absint( $_GET['enabled'] ); $enabled = absint( $_GET['enabled'] );

4
wp-admin/network/site-users.php
View File

@ -204,7 +204,7 @@ var current_site_id = <?php echo $id; ?>;
<div class="wrap"> <div class="wrap">
<h1 id="edit-site"><?php echo $title; ?></h1> <h1 id="edit-site"><?php echo $title; ?></h1>
<p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p> <p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
<h3 class="nav-tab-wrapper"> <h2 class="nav-tab-wrapper nav-tab-small">
<?php <?php
$tabs = array( $tabs = array(
'site-info' => array( 'label' => __( 'Info' ), 'url' => 'site-info.php' ), 'site-info' => array( 'label' => __( 'Info' ), 'url' => 'site-info.php' ),
@ -217,7 +217,7 @@ foreach ( $tabs as $tab_id => $tab ) {
echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>'; echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
} }
?> ?>
</h3><?php </h2><?php
if ( isset($_GET['update']) ) : if ( isset($_GET['update']) ) :
switch($_GET['update']) { switch($_GET['update']) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-34912'; $wp_version = '4.4-alpha-34913';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.