From 251dde5ade35abe27016d2565742255d6293df4c Mon Sep 17 00:00:00 2001 From: Brett Taylor Date: Wed, 15 Feb 2012 14:28:32 +1300 Subject: [PATCH 01/23] added 'search' ARIA role on searchform.php http://www.w3.org/TR/wai-aria/roles#search Signed-off-by: Brett Taylor --- searchform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searchform.php b/searchform.php index aa7fee4..3cba652 100644 --- a/searchform.php +++ b/searchform.php @@ -6,7 +6,7 @@ * @since _s 1.0 */ ?> -
+ From ebf6fe57ab38635c5e79a82312647283f82cc8ba Mon Sep 17 00:00:00 2001 From: Ian Stewart Date: Thu, 16 Feb 2012 20:59:28 +0000 Subject: [PATCH 02/23] _s: we need to use the stylesheet_uri here or the default child theme stylesheet overriding doesn't work. git-svn-id: https://wpcom-themes.svn.automattic.com/_s/@8956 d957f892-c61d-0410-b221-f235e6eecf30 --- functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions.php b/functions.php index 1b61f60..cf3e149 100644 --- a/functions.php +++ b/functions.php @@ -102,7 +102,7 @@ add_action( 'widgets_init', '_s_widgets_init' ); function _s_scripts() { global $post; - wp_enqueue_style( 'style', get_template_directory_uri() . '/style.css' ); + wp_enqueue_style( 'style', get_stylesheet_uri() ); wp_enqueue_script( 'jquery' ); From 6817af282cd161395248fb60daed9d057ac4a2a9 Mon Sep 17 00:00:00 2001 From: Michael Fields Date: Fri, 17 Feb 2012 22:34:53 +0000 Subject: [PATCH 03/23] _s: needs to be declared globally. git-svn-id: https://wpcom-themes.svn.automattic.com/_s/@8964 d957f892-c61d-0410-b221-f235e6eecf30 --- inc/wpcom.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/inc/wpcom.php b/inc/wpcom.php index 0080052..d90dbb6 100644 --- a/inc/wpcom.php +++ b/inc/wpcom.php @@ -6,9 +6,12 @@ * @since _s 1.0 */ +global $themecolors; + /** * Set a default theme color array for WP.com. * + * @global array $themecolors * @since _s 1.0 */ $themecolors = array( From 42fb1237cda5b3c2ac8ab179f6cf618e55fcf5d5 Mon Sep 17 00:00:00 2001 From: Lance Willett Date: Tue, 21 Feb 2012 06:28:24 +0000 Subject: [PATCH 04/23] _s: refix footer URL and extra spaces, originally fixed in r8766 but reverted in r8831 git-svn-id: https://wpcom-themes.svn.automattic.com/_s/@8981 d957f892-c61d-0410-b221-f235e6eecf30 --- footer.php | 2 +- image.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/footer.php b/footer.php index c8f8f86..99103b4 100644 --- a/footer.php +++ b/footer.php @@ -14,7 +14,7 @@
- + | Automattic' ); ?>
diff --git a/image.php b/image.php index 0d82a72..ed7901c 100644 --- a/image.php +++ b/image.php @@ -35,8 +35,8 @@ get_header(); From 86071d8c7d6435ee652bfc275c82d186a8021939 Mon Sep 17 00:00:00 2001 From: Date: Thu, 23 Feb 2012 19:31:05 +0000 Subject: [PATCH 05/23] _s: Remove duplicate .entry-meta class. git-svn-id: https://wpcom-themes.svn.automattic.com/_s/@9000 d957f892-c61d-0410-b221-f235e6eecf30 --- style.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/style.css b/style.css index 188c2e8..2388de4 100644 --- a/style.css +++ b/style.css @@ -415,9 +415,6 @@ a:active { .sticky { } -.entry-meta { - clear: both; -} .hentry { margin: 0 0 1.5em; } From 1b8246a7ee635cfc8e9ccb3bead3249e738509dc Mon Sep 17 00:00:00 2001 From: Giuseppe Capizzi Date: Sat, 25 Feb 2012 16:22:30 +0100 Subject: [PATCH 06/23] Update inc/tweaks.php --- inc/tweaks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/tweaks.php b/inc/tweaks.php index 1900ef3..03e8de9 100644 --- a/inc/tweaks.php +++ b/inc/tweaks.php @@ -25,7 +25,7 @@ add_filter( 'wp_page_menu_args', '_s_page_menu_args' ); * @since _s 1.0 */ function _s_body_classes( $classes ) { - // Adds a class of single-author to blogs with only 1 published author + // Adds a class of group-blog to blogs with more than 1 published author if ( is_multi_author() ) { $classes[] = 'group-blog'; } From 9fbba4ff7d9dc4ee0dc4fe0681f8c4d899eb67a0 Mon Sep 17 00:00:00 2001 From: Lance Willett Date: Wed, 29 Feb 2012 18:53:02 +0000 Subject: [PATCH 07/23] _s: rework nav JS file a bit * Remove top-level browser width variable, only needed in one internal function * Add timeout so that the resize action doesn't constantly trigger, instead give it a short delay to anticipate the user finishing the window size change * Better comments * Incorporate mattwiebe fix for calling jQuery objects incorrectly, see http://core.trac.wordpress.org/ticket/20131 git-svn-id: https://wpcom-themes.svn.automattic.com/_s/@9026 d957f892-c61d-0410-b221-f235e6eecf30 --- js/small-menu.js | 52 ++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/js/small-menu.js b/js/small-menu.js index d0e5a3c..28b3430 100644 --- a/js/small-menu.js +++ b/js/small-menu.js @@ -1,31 +1,39 @@ +/** + * Handles toggling the main navigation menu for small screens. + */ jQuery( document ).ready( function( $ ) { - var $browserWidth = $( window ).width(); - var $masthead = $( '#masthead' ); + var $masthead = $( '#masthead' ), + timeout = false; $.fn.smallMenu = function() { - $( $masthead ).find( '.site-navigation' ).removeClass( 'main-navigation' ).addClass( 'main-small-navigation' ); - $( $masthead ).find( '.site-navigation h1' ).removeClass( 'assistive-text' ).addClass( 'menu-toggle' ); + $masthead.find( '.site-navigation' ).removeClass( 'main-navigation' ).addClass( 'main-small-navigation' ); + $masthead.find( '.site-navigation h1' ).removeClass( 'assistive-text' ).addClass( 'menu-toggle' ); - $( '.menu-toggle' ).click( function () { - $( $masthead ).find( '.menu' ).toggle(); + $( '.menu-toggle' ).click( function() { + $masthead.find( '.menu' ).toggle(); $( this ).toggleClass( 'toggled-on' ); - }); - } + } ); + }; - $(window).resize(function() { - var $browserWidth = $( window ).width(); - - if ( $browserWidth < 600 ) { - $.fn.smallMenu(); - } else { - $( $masthead ).find( '.site-navigation' ).removeClass( 'main-small-navigation' ).addClass( 'main-navigation' ); - $( $masthead ).find( '.site-navigation h1' ).removeClass( 'menu-toggle' ).addClass( 'assistive-text' ); - $( $masthead ).find( '.menu' ).removeAttr( 'style' ); - } - }); - - if ( $browserWidth < 600 ) { + // Check viewport width on first load. + if ( $( window ).width() < 600 ) $.fn.smallMenu(); - } + // Check viewport width when user resizes the browser window. + $( window ).resize( function() { + var browserWidth = $( window ).width(); + + if ( false !== timeout ) + clearTimeout( timeout ); + + timeout = setTimeout( function() { + if ( browserWidth < 600 ) { + $.fn.smallMenu(); + } else { + $masthead.find( '.site-navigation' ).removeClass( 'main-small-navigation' ).addClass( 'main-navigation' ); + $masthead.find( '.site-navigation h1' ).removeClass( 'menu-toggle' ).addClass( 'assistive-text' ); + $masthead.find( '.menu' ).removeAttr( 'style' ); + } + }, 200 ); + } ); } ); \ No newline at end of file From be34e27d0411da7035906b71c0499f7d492bb18b Mon Sep 17 00:00:00 2001 From: Michael Fields Date: Tue, 6 Mar 2012 14:03:39 +0000 Subject: [PATCH 08/23] _s: Script dependancies need to be given as an array. Remove unneeded jQuery enqueue. git-svn-id: https://wpcom-themes.svn.automattic.com/_s/@9086 d957f892-c61d-0410-b221-f235e6eecf30 --- functions.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/functions.php b/functions.php index cf3e149..b7fda76 100644 --- a/functions.php +++ b/functions.php @@ -104,9 +104,7 @@ function _s_scripts() { wp_enqueue_style( 'style', get_stylesheet_uri() ); - wp_enqueue_script( 'jquery' ); - - wp_enqueue_script( 'small-menu', get_template_directory_uri() . '/js/small-menu.js', 'jquery', '20120206', true ); + wp_enqueue_script( 'small-menu', get_template_directory_uri() . '/js/small-menu.js', array( 'jquery' ), '20120206', true ); if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) { wp_enqueue_script( 'comment-reply' ); From c71f030c1848442fb6c0e65e802f3b6490fd6acc Mon Sep 17 00:00:00 2001 From: Michael Fields Date: Tue, 6 Mar 2012 14:40:49 +0000 Subject: [PATCH 09/23] _s: Move post meta separators inside conditionals ensuring that separators will not be orphaned. Use consistent 'edit link' whitespace in image.php as well. git-svn-id: https://wpcom-themes.svn.automattic.com/_s/@9087 d957f892-c61d-0410-b221-f235e6eecf30 --- content.php | 7 +++---- image.php | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/content.php b/content.php index 5a68e4f..1b60b5e 100644 --- a/content.php +++ b/content.php @@ -37,7 +37,6 @@ - | + | - | - | + - ', '' ); ?> + | ', '' ); ?>
diff --git a/image.php b/image.php index ed7901c..6b2dbd8 100644 --- a/image.php +++ b/image.php @@ -31,7 +31,7 @@ get_header(); get_the_title( $post->post_parent ) ); ?> - | ', '' ); ?> + | ', '' ); ?>