From b89ea9ea6618b059487f791d91f7ba4575ae1158 Mon Sep 17 00:00:00 2001
From: Lance Willett <lancewillett@git.wordpress.org>
Date: Wed, 16 Oct 2013 03:46:29 +0000
Subject: [PATCH] Twenty Fourteen: remove excerpts from featured posts, and
 display full titles instead. Props iamtakashi, closes #25581.

git-svn-id: https://develop.svn.wordpress.org/trunk@25804 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../twentyfourteen/content-featured-post.php  |   8 ---
 .../themes/twentyfourteen/functions.php       |  59 +-----------------
 .../twentyfourteen/images/placeholder.png     | Bin 3466 -> 0 bytes
 .../themes/twentyfourteen/style.css           |   4 ++
 4 files changed, 5 insertions(+), 66 deletions(-)
 delete mode 100644 src/wp-content/themes/twentyfourteen/images/placeholder.png

diff --git a/src/wp-content/themes/twentyfourteen/content-featured-post.php b/src/wp-content/themes/twentyfourteen/content-featured-post.php
index 52e5cf6c81..7d7099f4d8 100644
--- a/src/wp-content/themes/twentyfourteen/content-featured-post.php
+++ b/src/wp-content/themes/twentyfourteen/content-featured-post.php
@@ -27,10 +27,6 @@
 				if ( $images ) :
 					$image = array_shift( $images );
 					echo wp_get_attachment_image( $image->ID, 'featured-thumbnail-featured' );
-
-				else : ?>
-					<img class="featured-thumbnail-featured" src="<?php echo get_template_directory_uri(); ?>/images/placeholder.png" alt="" /><?php
-
 				endif;
 			endif;
 		?>
@@ -46,9 +42,5 @@
 
 			<?php the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' ); ?>
 		</header><!-- .entry-header -->
-
-		<div class="entry-summary">
-			<?php the_excerpt(); ?>
-		</div><!-- .entry-summary -->
 	</div>
 </article><!-- #post-## -->
diff --git a/src/wp-content/themes/twentyfourteen/functions.php b/src/wp-content/themes/twentyfourteen/functions.php
index 5acb1bb796..b42f50f76f 100644
--- a/src/wp-content/themes/twentyfourteen/functions.php
+++ b/src/wp-content/themes/twentyfourteen/functions.php
@@ -69,7 +69,7 @@ function twentyfourteen_setup() {
 
 	// Add several sizes for Post Thumbnails.
 	add_image_size( 'featured-thumbnail-large', 672, 0 );
-	add_image_size( 'featured-thumbnail-featured', 672, 336, true );
+	add_image_size( 'featured-thumbnail-featured', 672, 372, true );
 	add_image_size( 'featured-thumbnail-formatted', 306, 0 );
 
 	// This theme uses wp_nav_menu() in two locations.
@@ -253,63 +253,6 @@ function twentyfourteen_admin_fonts() {
 }
 add_action( 'admin_print_scripts-appearance_page_custom-header', 'twentyfourteen_admin_fonts' );
 
-/**
- * Set the post excerpt length to 20 words.
- *
- * @since Twenty Fourteen 1.0
- *
- * @param int $length
- * @return int
- */
-function twentyfourteen_excerpt_length( $length ) {
-	return 20;
-}
-add_filter( 'excerpt_length', 'twentyfourteen_excerpt_length' );
-
-/**
- * Return a "Continue Reading" link for excerpts.
- *
- * @since Twenty Fourteen 1.0
- *
- * @return string
- */
-function twentyfourteen_continue_reading_link() {
-	return ' <a href="'. esc_url( get_permalink() ) . '" class="more-link">' . __( 'Read More <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) . '</a>';
-}
-
-/**
- * Replace "[...]" (appended to automatically generated excerpts) with an
- * ellipsis and twentyfourteen_continue_reading_link().
- *
- * @since Twenty Fourteen 1.0
- *
- * @param string $more
- * @return string
- */
-function twentyfourteen_auto_excerpt_more( $more ) {
-	return ' &hellip;' . twentyfourteen_continue_reading_link();
-}
-add_filter( 'excerpt_more', 'twentyfourteen_auto_excerpt_more' );
-
-/**
- * Add a pretty "Continue Reading" link to custom post excerpts.
- *
- * To override this link in a child theme, remove the filter and add your own
- * function tied to the get_the_excerpt filter hook.
- *
- * @since Twenty Fourteen 1.0
- *
- * @param string $output
- * @return string
- */
-function twentyfourteen_custom_excerpt_more( $output ) {
-	if ( has_excerpt() && ! is_attachment() ) {
-		$output .= twentyfourteen_continue_reading_link();
-	}
-	return $output;
-}
-add_filter( 'get_the_excerpt', 'twentyfourteen_custom_excerpt_more' );
-
 if ( ! function_exists( 'twentyfourteen_the_attached_image' ) ) :
 /**
  * Print the attached image with a link to the next attached image.
diff --git a/src/wp-content/themes/twentyfourteen/images/placeholder.png b/src/wp-content/themes/twentyfourteen/images/placeholder.png
deleted file mode 100644
index 37377c352a59daccf1644be5b1b1ff76c5348a39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3466
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

diff --git a/src/wp-content/themes/twentyfourteen/style.css b/src/wp-content/themes/twentyfourteen/style.css
index cff4ed0d5a..20cc422b9b 100644
--- a/src/wp-content/themes/twentyfourteen/style.css
+++ b/src/wp-content/themes/twentyfourteen/style.css
@@ -3013,6 +3013,10 @@ span + .edit-link:before,
 		margin-left: 60px;
 	}
 
+	.featured-content {
+		margin-bottom: -24px;
+	}
+
 	.attachment-featured-featured {
 		height: 192px;
 	}