From bd5ac319113b4df653d3268f26b0e88f8df36a8c Mon Sep 17 00:00:00 2001
From: Lance Willett <lancewillett@git.wordpress.org>
Date: Mon, 28 Oct 2013 17:48:46 +0000
Subject: [PATCH] Twenty Fourteen: display titles for aside, link, and quote
 format on small screens. Props iamtakashi, fixes #25694.

git-svn-id: https://develop.svn.wordpress.org/trunk@25969 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../themes/twentyfourteen/content-aside.php   | 18 +++++++---------
 .../themes/twentyfourteen/content-link.php    |  8 +++++++
 .../themes/twentyfourteen/content-quote.php   | 18 +++++++---------
 .../themes/twentyfourteen/content.php         |  8 ++++++-
 .../themes/twentyfourteen/style.css           | 21 +++++--------------
 5 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/src/wp-content/themes/twentyfourteen/content-aside.php b/src/wp-content/themes/twentyfourteen/content-aside.php
index 394d65fe27..b7244e7e7e 100644
--- a/src/wp-content/themes/twentyfourteen/content-aside.php
+++ b/src/wp-content/themes/twentyfourteen/content-aside.php
@@ -18,6 +18,14 @@
 		</div><!-- .entry-meta -->
 		<?php endif; ?>
 
+		<?php
+			if ( is_single() ) :
+				the_title( '<h1 class="entry-title">', '</h1>' );
+			else :
+				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
+			endif;
+		?>
+
 		<div class="entry-meta">
 			<span class="post-format">
 				<a class="entry-format" href="<?php echo esc_url( get_post_format_link( 'aside' ) ); ?>"><?php echo get_post_format_string( 'aside' ); ?></a>
@@ -46,16 +54,6 @@
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
-		<div class="entry-meta">
-			<?php
-				if ( is_single() ) :
-					the_title( '<h1 class="entry-title">', '</h1>' );
-				else :
-					the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
-				endif;
-			?>
-		</div>
-
 		<?php if ( has_tag() ) : ?>
 		<span class="tag-links"><?php echo get_the_tag_list(); ?></span>
 		<?php endif; ?>
diff --git a/src/wp-content/themes/twentyfourteen/content-link.php b/src/wp-content/themes/twentyfourteen/content-link.php
index 282d94f46f..2e83c3a477 100644
--- a/src/wp-content/themes/twentyfourteen/content-link.php
+++ b/src/wp-content/themes/twentyfourteen/content-link.php
@@ -18,6 +18,14 @@
 		</div><!-- .entry-meta -->
 		<?php endif; ?>
 
+		<?php
+			if ( is_single() ) :
+				the_title( '<h1 class="entry-title">', '</h1>' );
+			else :
+				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
+			endif;
+		?>
+
 		<div class="entry-meta">
 			<span class="post-format">
 				<a class="entry-format" href="<?php echo esc_url( get_post_format_link( 'link' ) ); ?>"><?php echo get_post_format_string( 'link' ); ?></a>
diff --git a/src/wp-content/themes/twentyfourteen/content-quote.php b/src/wp-content/themes/twentyfourteen/content-quote.php
index 515f12ab2e..4a00b47332 100644
--- a/src/wp-content/themes/twentyfourteen/content-quote.php
+++ b/src/wp-content/themes/twentyfourteen/content-quote.php
@@ -18,6 +18,14 @@
 		</div><!-- .entry-meta -->
 		<?php endif; ?>
 
+		<?php
+			if ( is_single() ) :
+				the_title( '<h1 class="entry-title">', '</h1>' );
+			else :
+				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
+			endif;
+		?>
+
 		<div class="entry-meta">
 			<span class="post-format">
 				<a class="entry-format" href="<?php echo esc_url( get_post_format_link( 'quote' ) ); ?>"><?php echo get_post_format_string( 'quote' ); ?></a>
@@ -46,16 +54,6 @@
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
-		<div class="entry-meta">
-			<?php
-				if ( is_single() ) :
-					the_title( '<h1 class="entry-title">', '</h1>' );
-				else :
-					the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
-				endif;
-			?>
-		</div>
-
 		<?php if ( has_tag() ) : ?>
 		<span class="tag-links"><?php echo get_the_tag_list(); ?></span>
 		<?php endif; ?>
diff --git a/src/wp-content/themes/twentyfourteen/content.php b/src/wp-content/themes/twentyfourteen/content.php
index 30e5ad6b56..b3e0f4ca41 100644
--- a/src/wp-content/themes/twentyfourteen/content.php
+++ b/src/wp-content/themes/twentyfourteen/content.php
@@ -20,7 +20,13 @@
 		</div>
 		<?php endif; ?>
 
-		<?php the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' ); ?>
+		<?php
+			if ( is_single() ) :
+				the_title( '<h1 class="entry-title">', '</h1>' );
+			else :
+				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
+			endif;
+		?>
 
 		<div class="entry-meta">
 			<?php
diff --git a/src/wp-content/themes/twentyfourteen/style.css b/src/wp-content/themes/twentyfourteen/style.css
index 8082c31af5..5701110fcd 100644
--- a/src/wp-content/themes/twentyfourteen/style.css
+++ b/src/wp-content/themes/twentyfourteen/style.css
@@ -1058,7 +1058,7 @@ a.featured-thumbnail:hover {
 	clear: none;
 	font-size: 15px;
 	font-weight: 900;
-	line-height: 18px;
+	line-height: 1.2;
 	margin: 0 0 6px 0;
 }
 
@@ -1079,7 +1079,6 @@ a.featured-thumbnail:hover {
 }
 
 
-
 /**
  * 6.3 Entry Meta
  * -----------------------------------------------------------------------------
@@ -1506,20 +1505,10 @@ a.featured-thumbnail:hover {
 	padding-top: 0;
 }
 
-.site-content .entry-meta .entry-title {
-	font-size: 12px;
-	font-weight: 400;
-	line-height: 1.3333333333;
-	margin-bottom: 8px;
-	text-transform: none;
-}
-
-.entry-meta .entry-title a {
-	color: #767676;
-}
-
-.entry-meta .entry-title a:hover {
-	color: #2b2b2b;
+.site-content .format-link .entry-title,
+.site-content .format-aside .entry-title,
+.site-content .format-quote .entry-title {
+	display: none;
 }