<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[21554] trunk/wp-content/themes/twentytwelve: Twenty Twelve: improve navigation to be mobile-first and not rely on JS for hiding and showing, props obenland for patches.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21554">21554</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2012-08-20 18:35:33 +0000 (Mon, 20 Aug 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Twelve: improve navigation to be mobile-first and not rely on JS for hiding and showing, props obenland for patches. See <a href="http://core.trac.wordpress.org/ticket/21562">#21562</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelvefunctionsphp">trunk/wp-content/themes/twentytwelve/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelveheaderphp">trunk/wp-content/themes/twentytwelve/header.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvestylecss">trunk/wp-content/themes/twentytwelve/style.css</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelvejsnavigationjs">trunk/wp-content/themes/twentytwelve/js/navigation.js</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelvejsthemejs">trunk/wp-content/themes/twentytwelve/js/theme.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytwelvefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/functions.php (21553 => 21554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/functions.php 2012-08-20 17:25:06 UTC (rev 21553)
+++ trunk/wp-content/themes/twentytwelve/functions.php 2012-08-20 18:35:33 UTC (rev 21554)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> * JavaScript for handling navigation menus and the resized
</span><span class="cx"> * styles for small screen sizes.
</span><span class="cx"> */
</span><del>- wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/theme.js', array( 'jquery' ), '20120802', true );
</del><ins>+ wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array( 'jquery' ), '20120820', true );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Load special font CSS file.
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelveheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/header.php (21553 => 21554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/header.php 2012-08-20 17:25:06 UTC (rev 21553)
+++ trunk/wp-content/themes/twentytwelve/header.php 2012-08-20 18:35:33 UTC (rev 21554)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> </hgroup>
</span><span class="cx">
</span><span class="cx"> <nav class="site-navigation main-navigation" role="navigation">
</span><del>- <h3 class="assistive-text"><?php _e( 'Show navigation', 'twentytwelve' ); ?></h3>
</del><ins>+ <h3 class="menu-toggle"><?php _e( 'Show navigation', 'twentytwelve' ); ?></h3>
</ins><span class="cx"> <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>
</span><span class="cx"> <?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?>
</span><span class="cx"> </nav>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvejsnavigationjsfromrev21553trunkwpcontentthemestwentytwelvejsthemejs"></a>
<div class="copfile"><h4>Copied: trunk/wp-content/themes/twentytwelve/js/navigation.js (from rev 21553, trunk/wp-content/themes/twentytwelve/js/theme.js) (0 => 21554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/js/navigation.js (rev 0)
+++ trunk/wp-content/themes/twentytwelve/js/navigation.js 2012-08-20 18:35:33 UTC (rev 21554)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+/**
+ * navigation.js
+ *
+ * Handles toggling the navigation menu for small screens.
+ */
+
+jQuery( document ).ready( function( $ ) {
+ if ( $( '#masthead .menu' ).children().length ) {
+ $( '#masthead h3.assistive-text' ).addClass( 'menu-toggle' );
+ }
+
+ $( '.menu-toggle' ).off( 'click' ).click( function() {
+ $( '#masthead .menu' ).stop().slideToggle();
+ $( this ).toggleClass( 'toggled-on' );
+ } );
+} );
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvejsthemejs"></a>
<div class="delfile"><h4>Deleted: trunk/wp-content/themes/twentytwelve/js/theme.js (21553 => 21554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/js/theme.js 2012-08-20 17:25:06 UTC (rev 21553)
+++ trunk/wp-content/themes/twentytwelve/js/theme.js 2012-08-20 18:35:33 UTC (rev 21554)
</span><span class="lines">@@ -1,46 +0,0 @@
</span><del>-/**
- * navigation.js
- *
- * Handles toggling the navigation menu for small screens.
- */
-
-jQuery( document ).ready( function( $ ) {
- var masthead = $( '#masthead' ),
- largeWindow = window.matchMedia( 'screen and (min-width: 600px)' ),
- timeout = false;
-
- $.fn.smallMenu = function() {
- if ( ! masthead.find( '.menu' ).children().length ) {
- $( '.menu-toggle' ).remove();
- return;
- }
-
- 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' ).stop().slideToggle();
- $( this ).toggleClass( 'toggled-on' );
- } );
- };
-
- // Check viewport width on first load.
- if ( ! largeWindow.matches )
- $.fn.smallMenu();
-
- // Check viewport width when user resizes the browser window.
- $( window ).resize( function() {
- if ( false !== timeout )
- clearTimeout( timeout );
-
- timeout = setTimeout( function() {
- if ( ! largeWindow.matches ) {
- $.fn.smallMenu();
- } else {
- 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 );
- } );
-} );
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvestylecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/style.css (21553 => 21554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/style.css 2012-08-20 17:25:06 UTC (rev 21553)
+++ trunk/wp-content/themes/twentytwelve/style.css 2012-08-20 18:35:33 UTC (rev 21554)
</span><span class="lines">@@ -508,112 +508,31 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Navigation Menu */
</span><del>-.main-navigation .menu {
- display: inline-block;
</del><ins>+.main-navigation {
</ins><span class="cx"> margin-top: 24px;
</span><span class="cx"> margin-top: 1.714285714rem;
</span><del>- width: 100%;
- font-size: 12px;
- font-size: 0.857142857rem;
- border-top: 1px solid #ededed;
- border-bottom: 1px solid #ededed;
-}
-.main-navigation ul {
- 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 {
- text-transform: uppercase;
- color: #6a6a6a;
-}
-.main-navigation li a:hover {
- color: #000;
-}
-.main-navigation li {
- margin-right: 40px;
- margin-right: 2.857142857rem;
- position: relative;
-}
-.main-navigation li a {
- border-bottom: 0;
- line-height: 3.692307692;
-}
-.main-navigation li ul {
- display: none;
- position: absolute;
- top: 100%;
- padding: 0;
- margin: 0;
- z-index: 1;
-}
-.main-navigation li ul ul {
- top: 0;
- left: 100%;
-}
-.main-navigation ul li:hover > ul {
- display: block;
- border-left: 0;
-}
-.main-navigation li ul li,
-.main-navigation li ul li a {
</del><span class="cx"> text-align: center;
</span><span class="cx"> }
</span><del>-.main-navigation li ul li a {
- background: #efefef;
- border-bottom: 1px solid #ededed;
- display: block;
- font-size: 11px;
- font-size: 0.785714286rem;
- line-height: 2.181818182;
- padding: 8px 10px;
- padding: 0.571428571rem 0.714285714rem;
- width: 120px;
- width: 8.571428571rem;
-}
-.main-navigation li ul li a:hover {
- background: #e3e3e3;
- color: #444;
-}
-.main-navigation .current-menu-item > a,
-.main-navigation .current-menu-ancestor > a,
-.main-navigation .current_page_item > a,
-.main-navigation .current_page_ancestor > a {
- color: #636363;
- font-weight: bold;
-}
-nav[role="navigation"].main-small-navigation {
</del><ins>+.main-navigation li {
</ins><span class="cx"> margin-top: 24px;
</span><span class="cx"> margin-top: 1.714285714rem;
</span><del>- text-align: center;
-}
-nav[role="navigation"].main-small-navigation li {
- margin-top: 24px;
- margin-top: 1.714285714rem;
</del><span class="cx"> font-size: 12px;
</span><span class="cx"> font-size: 0.857142857rem;
</span><span class="cx"> line-height: 2;
</span><span class="cx"> float: none;
</span><span class="cx"> }
</span><del>-nav[role="navigation"].main-small-navigation a {
</del><ins>+.main-navigation a {
</ins><span class="cx"> color: #5e5e5e;
</span><span class="cx"> }
</span><del>-nav[role="navigation"].main-small-navigation a:hover {
</del><ins>+.main-navigation a:hover {
</ins><span class="cx"> color: #21759b;
</span><span class="cx"> }
</span><ins>+.main-navigation .menu {
+ display: none;
+}
</ins><span class="cx"> .menu-toggle {
</span><span class="cx"> display: inline-block;
</span><span class="cx"> }
</span><del>-.main-small-navigation .menu {
- display: none;
-}
</del><span class="cx">
</span><span class="cx"> /* Banner */
</span><span class="cx"> section[role="banner"] {
</span><span class="lines">@@ -1413,6 +1332,85 @@
</span><span class="cx"> font-size: 1.857142857rem;
</span><span class="cx"> line-height: 1.846153846;
</span><span class="cx"> }
</span><ins>+ .main-navigation .menu {
+ border-bottom: 1px solid #ededed;
+ border-top: 1px solid #ededed;
+ display: inline-block !important;
+ font-size: 12px;
+ font-size: 0.857142857rem;
+ text-align: left;
+ width: 100%;
+ }
+ .main-navigation ul {
+ 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 {
+ color: #6a6a6a;
+ text-transform: uppercase;
+ }
+ .main-navigation li a:hover {
+ color: #000;
+ }
+ .main-navigation li {
+ margin: 0 40px 0 0;
+ 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;
+ padding: 0;
+ position: absolute;
+ top: 100%;
+ z-index: 1;
+ }
+ .main-navigation li ul ul {
+ top: 0;
+ left: 100%;
+ }
+ .main-navigation ul li:hover > ul {
+ border-left: 0;
+ display: block;
+ }
+ .main-navigation li ul li a {
+ background: #efefef;
+ border-bottom: 1px solid #ededed;
+ display: block;
+ font-size: 11px;
+ font-size: 0.785714286rem;
+ line-height: 2.181818182;
+ padding: 8px 10px;
+ padding: 0.571428571rem 0.714285714rem;
+ width: 120px;
+ width: 8.571428571rem;
+ }
+ .main-navigation li ul li a:hover {
+ background: #e3e3e3;
+ color: #444;
+ }
+ .main-navigation .current-menu-item > a,
+ .main-navigation .current-menu-ancestor > a,
+ .main-navigation .current_page_item > a,
+ .main-navigation .current_page_ancestor > a {
+ color: #636363;
+ font-weight: bold;
+ }
+ .menu-toggle {
+ display: none;
+ }
</ins><span class="cx"> .entry-header .entry-title {
</span><span class="cx"> font-size: 22px;
</span><span class="cx"> font-size: 1.571428571rem;
</span></span></pre>
</div>
</div>
</body>
</html>