Changeset 21405

Timestamp:

08/02/2012 07:53:45 PM (14 years ago)

Author:

lancewillett

Message:

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

Location:

trunk/wp-content/themes/twentytwelve

Files:

• header.php (modified) (1 diff)
• js/theme.js (modified) (2 diffs)
• style.css (modified) (3 diffs)

trunk/wp-content/themes/twentytwelve/header.php

@@ -31 +31 @@
         </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>

trunk/wp-content/themes/twentytwelve/js/theme.js

@@ -11 +11 @@
 
     $.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() {
@@ -33 +33 @@
                 $.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' );
             }

trunk/wp-content/themes/twentytwelve/style.css

@@ -218 +218 @@
     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,
@@ -494 +495 @@
     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 {
@@ -1449 +1446 @@
         display: none;
     }
-    nav.main-navigation {
+    nav.site-navigation {
         display: none;
     }