Index: wp-content/themes/twentytwelve/style.css =================================================================== --- wp-content/themes/twentytwelve/style.css (revision 21600) +++ wp-content/themes/twentytwelve/style.css (working copy) @@ -513,10 +513,6 @@ margin-top: 1.714285714rem; text-align: center; } -.main-navigation li ul ul { - margin-left: 40px; - margin-left: 2.857142857rem; -} .main-navigation li { margin-top: 24px; margin-top: 1.714285714rem; @@ -531,9 +527,11 @@ .main-navigation a:hover { color: #21759b; } -.main-navigation .menu { +.main-navigation ul.nav-menu, +.main-navigation div.nav-menu > ul { display: none; } +.main-navigation ul.nav-menu.toggled-on, .menu-toggle { display: inline-block; } @@ -1340,7 +1338,8 @@ font-size: 1.857142857rem; line-height: 1.846153846; } - .main-navigation .menu { + .main-navigation ul.nav-menu, + .main-navigation div.nav-menu > ul { border-bottom: 1px solid #ededed; border-top: 1px solid #ededed; display: inline-block !important; @@ -1353,16 +1352,15 @@ margin: 0; text-indent: 0; } - .main-navigation li ul li { - padding-left: 0; - } .main-navigation li a, .main-navigation li { display: inline-block; text-decoration: none; } .main-navigation li a { + border-bottom: 0; color: #6a6a6a; + line-height: 3.692307692; text-transform: uppercase; } .main-navigation li a:hover { @@ -1373,10 +1371,6 @@ margin: 0 2.857142857rem 0 0; position: relative; } - .main-navigation li a { - border-bottom: 0; - line-height: 3.692307692; - } .main-navigation li ul { display: none; margin: 0; @@ -1386,7 +1380,6 @@ z-index: 1; } .main-navigation li ul ul { - margin-left: 0; top: 0; left: 100%; } @@ -1548,7 +1541,7 @@ .site-content nav, .widget-area, img.header-image, - nav.site-navigation { + .main-navigation { display: none; } .wrapper { Index: wp-content/themes/twentytwelve/js/navigation.js =================================================================== --- wp-content/themes/twentytwelve/js/navigation.js (revision 21600) +++ wp-content/themes/twentytwelve/js/navigation.js (working copy) @@ -3,14 +3,27 @@ * * Handles toggling the navigation menu for small screens. */ +( function() { + var button = document.getElementById( 'site-navigation' ).getElementsByTagName( 'h3' )[0], + menu = document.getElementById( 'site-navigation' ).getElementsByTagName( 'ul' )[0]; -jQuery( document ).ready( function( $ ) { - if ( ! $( '#masthead .menu' ).children().length ) { - $( '#masthead .menu-toggle' ).hide(); - } + if ( undefined == button || undefined == menu ) + return false; - $( '.menu-toggle' ).off( 'click' ).click( function() { - $( '#masthead .menu' ).stop().slideToggle(); - $( this ).toggleClass( 'toggled-on' ); - } ); -} ); \ No newline at end of file + button.onclick = function() { + if ( -1 == menu.className.indexOf( 'nav-menu' ) ) + menu.className = 'nav-menu'; + + if ( -1 != button.className.indexOf( 'toggled-on' ) ) { + button.className = button.className.replace( ' toggled-on', '' ); + menu.className = menu.className.replace( ' toggled-on', '' ); + } else { + button.className += ' toggled-on'; + menu.className += ' toggled-on'; + } + }; + + // Hide menu toggle button if menu is empty. + if ( ! menu.childNodes.length ) + button.style.display = 'none'; +} )(); \ No newline at end of file Index: wp-content/themes/twentytwelve/header.php =================================================================== --- wp-content/themes/twentytwelve/header.php (revision 21600) +++ wp-content/themes/twentytwelve/header.php (working copy) @@ -35,10 +35,10 @@
-