From 29b95be1b57deff6a6598ce0a15d48d40bfcd017 Mon Sep 17 00:00:00 2001
From: lancewillett <lancewillett@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 2 Aug 2012 19:53:45 +0000
Subject: [PATCH] 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
---
wp-content/themes/twentytwelve/header.php | 2 +-
wp-content/themes/twentytwelve/js/theme.js | 8 ++++----
wp-content/themes/twentytwelve/style.css | 9 +++------
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/wp-content/themes/twentytwelve/header.php b/wp-content/themes/twentytwelve/header.php
index 6ead771fe4..567b5e231e 100644
--- a/wp-content/themes/twentytwelve/header.php
+++ b/wp-content/themes/twentytwelve/header.php
@@ -30,7 +30,7 @@
<h2 class="site-description"><?php bloginfo( 'description' ); ?></h2>
</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>
<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' ) ); ?>
diff --git a/wp-content/themes/twentytwelve/js/theme.js b/wp-content/themes/twentytwelve/js/theme.js
index 5ff38605a8..c245695167 100644
--- a/wp-content/themes/twentytwelve/js/theme.js
+++ b/wp-content/themes/twentytwelve/js/theme.js
@@ -10,8 +10,8 @@ jQuery( document ).ready( function( $ ) {
timeout = false;
$.fn.smallMenu = function() {
- masthead.find( '.main-navigation' ).removeClass( 'main-navigation' ).addClass( 'main-small-navigation' );
- masthead.find( '.main-navigation h3' ).removeClass( 'assistive-text' ).addClass( 'menu-toggle' );
+ masthead.find( '.site-navigation' ).removeClass( 'main-navigation' ).addClass( 'main-small-navigation' );
+ masthead.find( '.site-navigation h3' ).removeClass( 'assistive-text' ).addClass( 'menu-toggle' );
$( '.menu-toggle' ).off( 'click' ).click( function() {
masthead.find( '.menu' ).slideToggle();
@@ -32,8 +32,8 @@ jQuery( document ).ready( function( $ ) {
if ( ! largeWindow.matches ) {
$.fn.smallMenu();
} else {
- masthead.find( '.main-navigation' ).removeClass( 'main-small-navigation' ).addClass( 'main-navigation' );
- masthead.find( '.main-navigation h3' ).removeClass( 'menu-toggle' ).addClass( 'assistive-text' );
+ masthead.find( '.site-navigation' ).removeClass( 'main-small-navigation' ).addClass( 'main-navigation' );
+ masthead.find( '.site-navigation h3' ).removeClass( 'menu-toggle' ).addClass( 'assistive-text' );
masthead.find( '.menu' ).removeAttr( 'style' );
}
}, 200 );
diff --git a/wp-content/themes/twentytwelve/style.css b/wp-content/themes/twentytwelve/style.css
index 2c2725faf3..9f0dd7c5d0 100644
--- a/wp-content/themes/twentytwelve/style.css
+++ b/wp-content/themes/twentytwelve/style.css
@@ -217,7 +217,8 @@ article.post-password-required input[type=submit]:hover {
background-image: -o-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,
article.post-password-required input[type=submit]:active,
input#searchsubmit.toggled-on {
@@ -494,10 +495,6 @@ a:hover {
display: inline-block;
text-decoration: none;
}
-.main-navigation li a .main-small-navigation,
-.main-navigation li .main-small-navigation {
- display: list-item;
-}
.main-navigation li a {
text-transform: uppercase;
color: #6a6a6a;
@@ -1448,7 +1445,7 @@ label ~ span.required {
img.header-image {
display: none;
}
- nav.main-navigation {
+ nav.site-navigation {
display: none;
}
.wrapper {