From a798664b3595f89d5c73abbfb3da3390fa380b97 Mon Sep 17 00:00:00 2001
From: Lance Willett <lancewillett@git.wordpress.org>
Date: Fri, 15 Nov 2013 19:01:00 +0000
Subject: [PATCH] Twenty Fourteen: remove `main-content` element where not
 necessary, props iamtakashi. See #25946.

git-svn-id: https://develop.svn.wordpress.org/trunk@26217 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-content/themes/twentyfourteen/404.php                 | 5 ++---
 src/wp-content/themes/twentyfourteen/archive.php             | 4 +---
 src/wp-content/themes/twentyfourteen/category.php            | 4 +---
 src/wp-content/themes/twentyfourteen/functions.php           | 4 +++-
 src/wp-content/themes/twentyfourteen/image.php               | 2 --
 src/wp-content/themes/twentyfourteen/search.php              | 4 +---
 src/wp-content/themes/twentyfourteen/single.php              | 4 +---
 src/wp-content/themes/twentyfourteen/tag.php                 | 4 +---
 .../themes/twentyfourteen/taxonomy-post_format.php           | 4 +---
 9 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/src/wp-content/themes/twentyfourteen/404.php b/src/wp-content/themes/twentyfourteen/404.php
index 7aedf99d4c..ed6e4fd137 100644
--- a/src/wp-content/themes/twentyfourteen/404.php
+++ b/src/wp-content/themes/twentyfourteen/404.php
@@ -9,7 +9,7 @@
 
 get_header(); ?>
 
-<div id="main-content" class="main-content">
+
 	<div id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 
@@ -25,9 +25,8 @@ get_header(); ?>
 
 		</div><!-- #content -->
 	</div><!-- #primary -->
-	<?php get_sidebar( 'content' ); ?>
-</div><!-- #main-content -->
 
 <?php
+get_sidebar( 'content' );
 get_sidebar();
 get_footer();
diff --git a/src/wp-content/themes/twentyfourteen/archive.php b/src/wp-content/themes/twentyfourteen/archive.php
index 7b7a5474c0..158dd3e411 100644
--- a/src/wp-content/themes/twentyfourteen/archive.php
+++ b/src/wp-content/themes/twentyfourteen/archive.php
@@ -19,7 +19,6 @@
 
 get_header(); ?>
 
-<div id="main-content" class="main-content">
 	<section id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 
@@ -60,9 +59,8 @@ get_header(); ?>
 			?>
 		</div><!-- #content -->
 	</section><!-- #primary -->
-	<?php get_sidebar( 'content' ); ?>
-</div><!-- #main-content -->
 
 <?php
+get_sidebar( 'content' );
 get_sidebar();
 get_footer();
diff --git a/src/wp-content/themes/twentyfourteen/category.php b/src/wp-content/themes/twentyfourteen/category.php
index 35108880db..e52358a280 100644
--- a/src/wp-content/themes/twentyfourteen/category.php
+++ b/src/wp-content/themes/twentyfourteen/category.php
@@ -11,7 +11,6 @@
 
 get_header(); ?>
 
-<div id="main-content" class="main-content">
 	<section id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 
@@ -44,9 +43,8 @@ get_header(); ?>
 			?>
 		</div><!-- #content -->
 	</section><!-- #primary -->
-	<?php get_sidebar( 'content' ); ?>
-</div><!-- #main-content -->
 
 <?php
+get_sidebar( 'content' );
 get_sidebar();
 get_footer();
diff --git a/src/wp-content/themes/twentyfourteen/functions.php b/src/wp-content/themes/twentyfourteen/functions.php
index 50efd1b264..48f701a7c7 100644
--- a/src/wp-content/themes/twentyfourteen/functions.php
+++ b/src/wp-content/themes/twentyfourteen/functions.php
@@ -217,6 +217,8 @@ function twentyfourteen_font_url() {
  * @return void
  */
 function twentyfourteen_scripts() {
+	global $wp_styles;
+
 	// Add Lato font, used in the main stylesheet.
 	wp_enqueue_style( 'twentyfourteen-lato', twentyfourteen_font_url(), array(), null );
 
@@ -228,7 +230,7 @@ function twentyfourteen_scripts() {
 
 	// Load the Internet Explorer specific stylesheet.
 	wp_enqueue_style( 'twentyfourteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfourteen-style' ), '20131110' );
-	wp_style_add_data( 'twentyfourteen-ie', 'conditional', 'lt IE 9' );
+	$wp_styles->add_data( 'twentyfourteen-ie', 'conditional', 'lt IE 9' );
 
 	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )
 		wp_enqueue_script( 'comment-reply' );
diff --git a/src/wp-content/themes/twentyfourteen/image.php b/src/wp-content/themes/twentyfourteen/image.php
index 5bb5b7bd9f..96f278ecd8 100644
--- a/src/wp-content/themes/twentyfourteen/image.php
+++ b/src/wp-content/themes/twentyfourteen/image.php
@@ -12,7 +12,6 @@ $metadata = wp_get_attachment_metadata();
 get_header();
 ?>
 
-<div id="main-content" class="main-content">
 	<section id="primary" class="content-area image-attachment">
 		<div id="content" class="site-content" role="main">
 
@@ -85,7 +84,6 @@ get_header();
 
 		</div><!-- #content -->
 	</section><!-- #primary -->
-</div><!-- #main-content -->
 
 <?php
 get_sidebar();
diff --git a/src/wp-content/themes/twentyfourteen/search.php b/src/wp-content/themes/twentyfourteen/search.php
index f804da8ee2..240c2d0d46 100644
--- a/src/wp-content/themes/twentyfourteen/search.php
+++ b/src/wp-content/themes/twentyfourteen/search.php
@@ -9,7 +9,6 @@
 
 get_header(); ?>
 
-<div id="main-content" class="main-content">
 	<section id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 
@@ -35,10 +34,9 @@ get_header(); ?>
 
 		</div><!-- #content -->
 	</section><!-- #primary -->
-	<?php get_sidebar( 'content' ); ?>
-</div><!-- #main-content -->
 
 <?php
+get_sidebar( 'content' );
 get_sidebar();
 get_footer();
 
diff --git a/src/wp-content/themes/twentyfourteen/single.php b/src/wp-content/themes/twentyfourteen/single.php
index 2f274a7566..9eb71d47fb 100644
--- a/src/wp-content/themes/twentyfourteen/single.php
+++ b/src/wp-content/themes/twentyfourteen/single.php
@@ -9,7 +9,6 @@
 
 get_header(); ?>
 
-<div id="main-content" class="main-content">
 	<div id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 			<?php
@@ -27,9 +26,8 @@ get_header(); ?>
 			?>
 		</div><!-- #content -->
 	</div><!-- #primary -->
-	<?php get_sidebar( 'content' ); ?>
-</div><!-- #main-content -->
 
 <?php
+get_sidebar( 'content' );
 get_sidebar();
 get_footer();
diff --git a/src/wp-content/themes/twentyfourteen/tag.php b/src/wp-content/themes/twentyfourteen/tag.php
index f854f7513e..5e0a27eb47 100644
--- a/src/wp-content/themes/twentyfourteen/tag.php
+++ b/src/wp-content/themes/twentyfourteen/tag.php
@@ -13,7 +13,6 @@
 
 get_header(); ?>
 
-<div id="main-content" class="main-content">
 	<section id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 
@@ -46,9 +45,8 @@ get_header(); ?>
 			?>
 		</div><!-- #content -->
 	</section><!-- #primary -->
-	<?php get_sidebar( 'content' ); ?>
-</div><!-- #main-content -->
 
 <?php
+get_sidebar( 'content' );
 get_sidebar();
 get_footer();
diff --git a/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php b/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php
index 5449f60b71..82290a79e9 100644
--- a/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php
+++ b/src/wp-content/themes/twentyfourteen/taxonomy-post_format.php
@@ -15,7 +15,6 @@
 
 get_header(); ?>
 
-<div id="main-content" class="main-content">
 	<section id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 
@@ -68,9 +67,8 @@ get_header(); ?>
 			?>
 		</div><!-- #content -->
 	</section><!-- #primary -->
-	<?php get_sidebar( 'content' ); ?>
-</div><!-- #main-content -->
 
 <?php
+get_sidebar( 'content' );
 get_sidebar();
 get_footer();