From 8b6122a94fa2bf59d2894ee0d57ff7265fb02777 Mon Sep 17 00:00:00 2001
From: lancewillett <lancewillett@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 25 Jul 2012 17:55:50 +0000
Subject: [PATCH] Twenty Twelve: tag and category descriptions should not be
 part of h1 element. Props obenland, see #21255.

git-svn-id: http://core.svn.wordpress.org/trunk@21331 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 archive.php | 55 +++++++++++++++++++++++++++++++----------------------
 style.css   | 11 ++++++++++-
 2 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/archive.php b/archive.php
index eb797373a..626f8965b 100644
--- a/archive.php
+++ b/archive.php
@@ -18,29 +18,38 @@ get_header(); ?>
 		<div id="content" role="main">
 
 		<?php if ( have_posts() ) : ?>
-			<h1 class="archive-title"><?php
-				if ( is_day() ) {
-					printf( __( 'Daily Archives: %s', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' );
-				} elseif ( is_month() ) {
-					printf( __( 'Monthly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentytwelve' ) ) . '</span>' );
-				} elseif ( is_year() ) {
-					printf( __( 'Yearly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentytwelve' ) ) . '</span>' );
-				} elseif ( is_tag() ) {
-					printf( __( 'Tag Archives: %s', 'twentytwelve' ), '<span>' . single_tag_title( '', false ) . '</span>' );
-					// Show an optional tag description
-					$tag_description = tag_description();
-					if ( $tag_description )
-						echo '<div class="tag-archive-meta">' . $tag_description . '</div>';
-				} elseif ( is_category() ) {
-					printf( __( 'Category Archives: %s', 'twentytwelve' ), '<span>' . single_cat_title( '', false ) . '</span>' );
-					// Show an optional category description
-					$category_description = category_description();
-					if ( $category_description )
-						echo '<div class="category-archive-meta">' . $category_description . '</div>';
-				} else {
-					_e( 'Blog Archives', 'twentytwelve' );
-				}
-			?></h1>
+			<header class="archive-header">
+				<h1 class="archive-title"><?php
+					if ( is_day() ) {
+						printf( __( 'Daily Archives: %s', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' );
+					} elseif ( is_month() ) {
+						printf( __( 'Monthly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentytwelve' ) ) . '</span>' );
+					} elseif ( is_year() ) {
+						printf( __( 'Yearly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentytwelve' ) ) . '</span>' );
+					} elseif ( is_tag() ) {
+						printf( __( 'Tag Archives: %s', 'twentytwelve' ), '<span>' . single_tag_title( '', false ) . '</span>' );
+					} elseif ( is_category() ) {
+						printf( __( 'Category Archives: %s', 'twentytwelve' ), '<span>' . single_cat_title( '', false ) . '</span>' );
+					} else {
+						_e( 'Blog Archives', 'twentytwelve' );
+					}
+				?></h1>
+
+				<?php
+					// Show an optional tag description.
+					if ( is_tag() ) {
+						$tag_description = tag_description();
+						if ( $tag_description )
+							echo '<div class="archive-meta">' . $tag_description . '</div>';
+					}
+					// Show an optional category description.
+					if ( is_category() ) {
+						$category_description = category_description();
+						if ( $category_description )
+							echo '<div class="archive-meta">' . $category_description . '</div>';
+					}
+				?>
+			</header><!-- /. archive-header -->
 
 			<?php
 			/* Start the Loop */
diff --git a/style.css b/style.css
index 4d79a7b1f..f0eb3a080 100644
--- a/style.css
+++ b/style.css
@@ -1072,7 +1072,7 @@ footer .edit-link {
 /* =Styling for the archive view
 -------------------------------------------------------------- */
 
-.archive #content .archive-title,
+.archive #content .archive-header,
 .search .page-header {
 	margin-bottom: 48px;
 	margin-bottom: 3.428571429rem;
@@ -1080,6 +1080,15 @@ footer .edit-link {
 	padding-bottom: 1.571428571rem;
 	border-bottom: 1px solid #ededed;
 }
+.archive-meta {
+	color: #636363;
+	font-size: 11px;
+	font-size: 0.785714286rem;
+	line-height: 2.181818182;
+	margin-top: 22px;
+	margin-top: 1.571428571rem;
+	text-transform: uppercase;
+}
 
 
 /* =Styling for the single image attachment view