golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Twenty Twelve: fix navigation selectors as the change in r21404 broke the small navigation menu behavior. 

git-svn-id: http://core.svn.wordpress.org/trunk@21405 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
lancewillett 2012-08-02 19:53:45 +00:00
parent 2ecc5bacb8
commit 26785790fd
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
header.php
View File

@ -30,7 +30,7 @@
<h2 class="site-description"><?php bloginfo( 'description' ); ?></h2> <h2 class="site-description"><?php bloginfo( 'description' ); ?></h2>
</hgroup> </hgroup>
<nav class="main-navigation" role="navigation"> <nav class="site-navigation main-navigation" role="navigation">
<h3 class="assistive-text"><?php _e( 'Show navigation', 'twentytwelve' ); ?></h3> <h3 class="assistive-text"><?php _e( 'Show navigation', 'twentytwelve' ); ?></h3>
<div class="skip-link assistive-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentytwelve' ); ?>"><?php _e( 'Skip to content', 'twentytwelve' ); ?></a></div> <div class="skip-link assistive-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentytwelve' ); ?>"><?php _e( 'Skip to content', 'twentytwelve' ); ?></a></div>
<?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?> <?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?>

8
js/theme.js
View File

@ -10,8 +10,8 @@ jQuery( document ).ready( function( $ ) {
timeout = false; timeout = false;
$.fn.smallMenu = function() { $.fn.smallMenu = function() {
masthead.find( '.main-navigation' ).removeClass( 'main-navigation' ).addClass( 'main-small-navigation' ); masthead.find( '.site-navigation' ).removeClass( 'main-navigation' ).addClass( 'main-small-navigation' );
masthead.find( '.main-navigation h3' ).removeClass( 'assistive-text' ).addClass( 'menu-toggle' ); masthead.find( '.site-navigation h3' ).removeClass( 'assistive-text' ).addClass( 'menu-toggle' );
$( '.menu-toggle' ).off( 'click' ).click( function() { $( '.menu-toggle' ).off( 'click' ).click( function() {
masthead.find( '.menu' ).slideToggle(); masthead.find( '.menu' ).slideToggle();
@ -32,8 +32,8 @@ jQuery( document ).ready( function( $ ) {
if ( ! largeWindow.matches ) { if ( ! largeWindow.matches ) {
$.fn.smallMenu(); $.fn.smallMenu();
} else { } else {
masthead.find( '.main-navigation' ).removeClass( 'main-small-navigation' ).addClass( 'main-navigation' ); masthead.find( '.site-navigation' ).removeClass( 'main-small-navigation' ).addClass( 'main-navigation' );
masthead.find( '.main-navigation h3' ).removeClass( 'menu-toggle' ).addClass( 'assistive-text' ); masthead.find( '.site-navigation h3' ).removeClass( 'menu-toggle' ).addClass( 'assistive-text' );
masthead.find( '.menu' ).removeAttr( 'style' ); masthead.find( '.menu' ).removeAttr( 'style' );
} }
}, 200 ); }, 200 );

9
style.css
View File

@ -217,7 +217,8 @@ article.post-password-required input[type=submit]:hover {
background-image: -o-linear-gradient(top, #f9f9f9, #ebebeb); background-image: -o-linear-gradient(top, #f9f9f9, #ebebeb);
background-image: linear-gradient(top, #f9f9f9, #ebebeb); background-image: linear-gradient(top, #f9f9f9, #ebebeb);
} }
.menu-toggle:active, .menu-toggle.toggled-on, .menu-toggle:active,
.menu-toggle.toggled-on,
input#searchsubmit:active, input#searchsubmit:active,
article.post-password-required input[type=submit]:active, article.post-password-required input[type=submit]:active,
input#searchsubmit.toggled-on { input#searchsubmit.toggled-on {
@ -494,10 +495,6 @@ a:hover {
display: inline-block; display: inline-block;
text-decoration: none; text-decoration: none;
} }
.main-navigation li a .main-small-navigation,
.main-navigation li .main-small-navigation {
display: list-item;
}
.main-navigation li a { .main-navigation li a {
text-transform: uppercase; text-transform: uppercase;
color: #6a6a6a; color: #6a6a6a;
@ -1448,7 +1445,7 @@ label ~ span.required {
img.header-image { img.header-image {
display: none; display: none;
} }
nav.main-navigation { nav.site-navigation {
display: none; display: none;
} }
.wrapper { .wrapper {