From 1f2397af3488d731f5ea76e55b9bd383744e39dc Mon Sep 17 00:00:00 2001
From: Ian Stewart <ian@themeshaper.com>
Date: Tue, 11 Nov 2014 19:02:22 +0000
Subject: [PATCH] Twenty Fifteen: simpler CSS by using divs instead of spans
 for menu descriptions.

Props philiparthurmoore, fixes #30296


Built from https://develop.svn.wordpress.org/trunk@30302


git-svn-id: http://core.svn.wordpress.org/trunk@30301 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyfifteen/functions.php | 2 +-
 wp-content/themes/twentyfifteen/style.css     | 1 -
 wp-includes/version.php                       | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/wp-content/themes/twentyfifteen/functions.php b/wp-content/themes/twentyfifteen/functions.php
index a5545d833f..ebba907252 100644
--- a/wp-content/themes/twentyfifteen/functions.php
+++ b/wp-content/themes/twentyfifteen/functions.php
@@ -294,7 +294,7 @@ add_action( 'wp_enqueue_scripts', 'twentyfifteen_post_nav_background' );
  */
 function twentyfifteen_nav_description( $item_output, $item, $depth, $args ) {
 	if ( 'primary' == $args->theme_location && $item->description ) {
-		$item_output = str_replace( $args->link_after . '</a>', '<span class="menu-item-description">' . $item->description . '</span>' . $args->link_after . '</a>', $item_output );
+		$item_output = str_replace( $args->link_after . '</a>', '<div class="menu-item-description">' . $item->description . '</div>' . $args->link_after . '</a>', $item_output );
 	}
 
 	return $item_output;
diff --git a/wp-content/themes/twentyfifteen/style.css b/wp-content/themes/twentyfifteen/style.css
index fb2295c564..5951091640 100644
--- a/wp-content/themes/twentyfifteen/style.css
+++ b/wp-content/themes/twentyfifteen/style.css
@@ -692,7 +692,6 @@ a:focus {
 .main-navigation .menu-item-description {
 	color: #707070;
 	color: rgba(51, 51, 51, 0.7);
-	display: block;
 	font-family: "Noto Sans", sans-serif;
 	font-size: 12px;
 	font-size: 1.2rem;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ec866e2b26..dc48edea3a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-alpha-30301';
+$wp_version = '4.1-alpha-30302';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.