From d3a4604335a0acd2e7c8de724eb8ea9d4852699c Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Sun, 5 Aug 2012 21:37:57 +0000
Subject: [PATCH] Accessibility: fix the Skip to content link, show it on
 :focus, improve the styling of the skip links when shown, see #21310, see
 #21471

git-svn-id: https://develop.svn.wordpress.org/trunk@21435 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/admin-header.php         |  4 ++--
 wp-admin/css/wp-admin.dev.css     | 14 ++++++++++++++
 wp-admin/js/common.dev.js         |  5 -----
 wp-includes/css/admin-bar.dev.css |  8 +++++---
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index e2eb9bd9a7..16a7c432a1 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -107,7 +107,7 @@ if ( wp_script_is( 'customize-loader', 'queue' ) && current_user_can( 'edit_them
 ?>
 
 <div id="wpwrap">
-<a id="wpbody-content-shortcut" tabindex="5" href="#wpbody-content" class="hide-if-no-js screen-reader-text"><?php _e('Skip to main content'); ?></a>
+<a tabindex="1" href="#wpbody-content" class="screen-reader-text screen-reader-shortcut"><?php _e('Skip to main content'); ?></a>
 <?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
 <div id="wpcontent">
 
@@ -123,7 +123,7 @@ $current_screen->set_parentage( $parent_file );
 
 ?>
 
-<div id="wpbody-content" tabindex="-1" aria-label="<?php esc_attr_e('Main content'); ?>">
+<div id="wpbody-content" aria-label="<?php esc_attr_e('Main content'); ?>">
 <?php
 
 $current_screen->render_screen_meta();
diff --git a/wp-admin/css/wp-admin.dev.css b/wp-admin/css/wp-admin.dev.css
index d9307ca329..a55c4960b4 100644
--- a/wp-admin/css/wp-admin.dev.css
+++ b/wp-admin/css/wp-admin.dev.css
@@ -198,6 +198,20 @@ TABLE OF CONTENTS:
 	overflow: hidden;
 }
 
+.screen-reader-shortcut:focus {
+	left: 5px;
+	top: 5px;
+	height: auto;
+	width: auto;
+	display: block;
+	padding: 10px 15px;
+	background: #fff;
+	color: #000;
+	border: 2px solid #333;
+	border-radius: 3px;
+	z-index: 100000;
+}
+
 .hidden,
 .js .closed .inside,
 .js .hide-if-js,
diff --git a/wp-admin/js/common.dev.js b/wp-admin/js/common.dev.js
index b864055a86..064e90572c 100644
--- a/wp-admin/js/common.dev.js
+++ b/wp-admin/js/common.dev.js
@@ -374,11 +374,6 @@ $(document).ready( function() {
 				pageInput.val('1');
 		});
 	}
-
-	$('#wpbody-content-shortcut').bind('click.wp-skip-to-content', function(e){
-		$('#wpbody-content').focus();
-		e.preventDefault();
-	});
 });
 
 // internal use
diff --git a/wp-includes/css/admin-bar.dev.css b/wp-includes/css/admin-bar.dev.css
index 93c696dea1..fd8b35d63b 100644
--- a/wp-includes/css/admin-bar.dev.css
+++ b/wp-includes/css/admin-bar.dev.css
@@ -619,17 +619,19 @@
 }
 
 #wpadminbar #wpadminbar-shortcut:focus {
-	left: 0;
-	top: 0;
+	left: 5px;
+	top: 5px;
 	height: auto;
 	width: auto;
 	display: block;
 	padding: 10px 15px;
 	background: #fff;
 	color: #000;
-	outline: none;
+	border: 2px solid #333;
+	border-radius: 3px;
 	z-index: 100000;
 	text-shadow: none;
+	line-height: normal;
 }
 
 /**