Changeset 21331

Timestamp:

07/25/2012 05:55:50 PM (11 years ago)

Author:

lancewillett

Message:

Twenty Twelve: tag and category descriptions should not be part of h1 element. Props obenland, see #21255.

Location:

trunk/wp-content/themes/twentytwelve

Files:

• archive.php (modified) (1 diff)
• style.css (modified) (2 diffs)

trunk/wp-content/themes/twentytwelve/archive.php

@@ -19 +19 @@
 
         <?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

trunk/wp-content/themes/twentytwelve/style.css

@@ -1073 +1073 @@
 -------------------------------------------------------------- */
 
-.archive #content .archive-title,
+.archive #content .archive-header,
 .search .page-header {
     margin-bottom: 48px;
@@ -1080 +1080 @@
     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;
 }