Changeset 25856

Timestamp:

10/21/2013 04:34:56 PM (12 years ago)

Author:

lancewillett

Message:

Twenty Fourteen: fix non-image attachment page layout, props iamtakashi. Fixes #25624.

Location:

trunk/src/wp-content/themes/twentyfourteen

Files:

• functions.php (modified) (2 diffs)
• inc/template-tags.php (modified) (1 diff)
• style.css (modified) (3 diffs)

trunk/src/wp-content/themes/twentyfourteen/functions.php

@@ -119 +119 @@
 
 /**
- * Adjust content_width value for full-width and attachment templates.
+ * Adjust content_width value for image attachment template.
  *
  * @since Twenty Fourteen 1.0
@@ -126 +126 @@
  */
 function twentyfourteen_content_width() {
-    if ( is_attachment() )
+    if ( is_attachment() && wp_attachment_is_image() )
         $GLOBALS['content_width'] = 810;
 }

trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php

@@ -81 +81 @@
         <div class="nav-links">
             <?php
+            if ( is_attachment() ) :
+                previous_post_link( '%link', __( '<span class="meta-nav">Published In</span>%title', 'twentyfourteen' ) );
+            else :
                 previous_post_link( '%link', __( '<span class="meta-nav">Previous Post</span>%title', 'twentyfourteen' ) );
                 next_post_link( '%link', __( '<span class="meta-nav">Next Post</span>%title', 'twentyfourteen' ) );
+            endif;
             ?>
         </div><!-- .nav-links -->

trunk/src/wp-content/themes/twentyfourteen/style.css

@@ -1733 +1733 @@
  */
 
+.attachment .content-sidebar {
+    display: none;
+}
+
 .attachment .entry-content {
     padding-top: 0;
@@ -1740 +1744 @@
     text-transform: none;
 }
+
 .entry-attachment .attachment {
     margin-bottom: 24px;
@@ -2962 +2967 @@
     }
 
-    .attachment .entry-content .attachment {
+    .attachment .entry-attachment .attachment {
         margin-right: -168px;
         margin-left: -168px;