From 4d00172987bc61fd7f3d2a54f738412b107286a9 Mon Sep 17 00:00:00 2001 From: Lance Willett Date: Thu, 15 Jan 2015 23:05:22 +0000 Subject: [PATCH] Twenty Fifteen: remove unused CSS rules for `wp_page_menu` since are not used in the theme. And a bit of CSS cleanup. Props iamtakashi, fixes #30957. Built from https://develop.svn.wordpress.org/trunk@31183 git-svn-id: http://core.svn.wordpress.org/trunk@31164 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-content/themes/twentyfifteen/css/ie.css | 10 ++++---- .../themes/twentyfifteen/js/functions.js | 2 +- wp-content/themes/twentyfifteen/rtl.css | 22 +++--------------- wp-content/themes/twentyfifteen/style.css | 23 ++++--------------- wp-includes/version.php | 2 +- 5 files changed, 13 insertions(+), 46 deletions(-) diff --git a/wp-content/themes/twentyfifteen/css/ie.css b/wp-content/themes/twentyfifteen/css/ie.css index 76ef8a4f92..53de092d9d 100644 --- a/wp-content/themes/twentyfifteen/css/ie.css +++ b/wp-content/themes/twentyfifteen/css/ie.css @@ -125,9 +125,8 @@ textarea { padding: 0.75em 0; } -.main-navigation .page_item_has_children > a, -.main-navigation .main-navigation .menu-item-has-children > a { - padding-right: 53px; +.main-navigation .menu-item-has-children > a { + padding-right: 48px; } .main-navigation .menu-item-description { @@ -839,10 +838,9 @@ video { margin-left: auto; } -.rtl .main-navigation .page_item_has_children > a, -.rtl .main-navigation .main-navigation .menu-item-has-children > a { +.rtl .main-navigation .menu-item-has-children > a { padding-right: 0; - padding-left: 53px; + padding-left: 48px; } .rtl .secondary-toggle { diff --git a/wp-content/themes/twentyfifteen/js/functions.js b/wp-content/themes/twentyfifteen/js/functions.js index 6610757eb0..eb4f8fa6d9 100644 --- a/wp-content/themes/twentyfifteen/js/functions.js +++ b/wp-content/themes/twentyfifteen/js/functions.js @@ -11,7 +11,7 @@ topOffset = 0, bodyHeight, sidebarHeight, resizeTimer; // Add dropdown toggle that display child menu items. - $( '.main-navigation .page_item_has_children > a, .main-navigation .menu-item-has-children > a' ).after( '' ); + $( '.main-navigation .menu-item-has-children > a' ).after( '' ); $( '.dropdown-toggle' ).click( function( e ) { var _this = $( this ); diff --git a/wp-content/themes/twentyfifteen/rtl.css b/wp-content/themes/twentyfifteen/rtl.css index 35259a664f..4f4a471cdd 100644 --- a/wp-content/themes/twentyfifteen/rtl.css +++ b/wp-content/themes/twentyfifteen/rtl.css @@ -156,7 +156,6 @@ td { margin-left: auto; } -.main-navigation .page_item_has_children > a, .main-navigation .menu-item-has-children > a { padding-right: 0; padding-left: 48px; @@ -477,12 +476,6 @@ img.alignleft { margin-left: auto; } - .main-navigation .page_item_has_children > a, - .main-navigation .main-navigation .menu-item-has-children > a { - padding-right: 0; - padding-left: 54px; - } - blockquote.alignright, .wp-caption.alignright img.alignright { @@ -567,12 +560,6 @@ img.alignleft { padding-left: 0; } - .main-navigation .page_item_has_children > a, - .main-navigation .main-navigation .menu-item-has-children > a { - padding-right: 0; - padding-left: 53px; - } - blockquote.alignright, .wp-caption.alignright img.alignright { @@ -652,10 +639,9 @@ img.alignleft { padding-left: 0; } - .main-navigation .page_item_has_children > a, .main-navigation .menu-item-has-children > a { padding-right: 0; - padding-left: 35px; + padding-left: 30px; } blockquote.alignright, @@ -729,10 +715,9 @@ img.alignleft { padding-left: 0; } - .main-navigation .page_item_has_children > a, .main-navigation .menu-item-has-children > a { padding-right: 0; - padding-left: 33px; + padding-left: 34px; } blockquote.alignright, @@ -795,10 +780,9 @@ img.alignleft { padding-left: 0; } - .main-navigation .page_item_has_children > a, .main-navigation .menu-item-has-children > a { padding-right: 0; - padding-left: 32px; + padding-left: 38px; } blockquote.alignright, diff --git a/wp-content/themes/twentyfifteen/style.css b/wp-content/themes/twentyfifteen/style.css index 60ab5e49b0..654c16d5f8 100644 --- a/wp-content/themes/twentyfifteen/style.css +++ b/wp-content/themes/twentyfifteen/style.css @@ -682,9 +682,8 @@ a:focus { position: relative; } -.main-navigation .current_page_item > a, .main-navigation .current-menu-item > a, -.main-navigation .current_page_ancestor > a { +.main-navigation .current-menu-ancestor > a { font-weight: 700; } @@ -693,7 +692,6 @@ a:focus { border-top: 0; } -.main-navigation .page_item_has_children > a, .main-navigation .menu-item-has-children > a { padding-right: 48px; } @@ -2959,11 +2957,6 @@ p > video { margin-left: 1em; } - .main-navigation .page_item_has_children > a, - .main-navigation .main-navigation .menu-item-has-children > a { - padding-right: 54px; - } - .main-navigation .menu-item-description { font-size: 14px; font-size: 1.4rem; @@ -3585,11 +3578,6 @@ p > video { padding: 0.75em 0; } - .main-navigation .page_item_has_children > a, - .main-navigation .main-navigation .menu-item-has-children > a { - padding-right: 53px; - } - .main-navigation .menu-item-description { font-size: 16px; font-size: 1.6rem; @@ -4185,9 +4173,8 @@ p > video { padding: 0.5em 0; } - .main-navigation .page_item_has_children > a, .main-navigation .menu-item-has-children > a { - padding-right: 35px; + padding-right: 30px; } .main-navigation .menu-item-description { @@ -4845,9 +4832,8 @@ p > video { padding: 0.4643em 0; } - .main-navigation .page_item_has_children > a, .main-navigation .menu-item-has-children > a { - padding-right: 33px; + padding-right: 34px; } .main-navigation .menu-item-description { @@ -5384,9 +5370,8 @@ p > video { padding: 0.5em 0; } - .main-navigation .page_item_has_children > a, .main-navigation .menu-item-has-children > a { - padding-right: 32px; + padding-right: 38px; } .main-navigation .menu-item-description { diff --git a/wp-includes/version.php b/wp-includes/version.php index 45cd311315..6566c66f92 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31182'; +$wp_version = '4.2-alpha-31183'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.