Merge with upstream/master.

This commit is contained in:
David A. Kennedy 2014-05-20 15:56:31 -04:00
commit 1365515b74
3 changed files with 5 additions and 3 deletions

View File

@ -20,6 +20,7 @@
<body <?php body_class(); ?>>
<div id="page" class="hfeed site">
<a class="skip-link screen-reader-text" href="#content"><?php _e( 'Skip to content', '_s' ); ?></a>
<header id="masthead" class="site-header" role="banner">
<div class="site-branding">
@ -29,8 +30,6 @@
<nav id="site-navigation" class="main-navigation" role="navigation">
<button class="menu-toggle"><?php _e( 'Primary Menu', '_s' ); ?></button>
<a class="skip-link screen-reader-text" href="#content"><?php _e( 'Skip to content', '_s' ); ?></a>
<?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?>
</nav><!-- #site-navigation -->
</header><!-- #masthead -->

View File

@ -46,7 +46,7 @@ function _s_wp_title( $title, $sep ) {
if ( is_feed() ) {
return $title;
}
global $page, $paged;
// Add the blog name

View File

@ -453,6 +453,9 @@ a:active {
.screen-reader-text {
clip: rect(1px, 1px, 1px, 1px);
position: absolute !important;
height: 1px;
width: 1px;
overflow: hidden;
}
.screen-reader-text:hover,