Changeset 24720

Timestamp:

07/17/2013 04:51:06 AM (12 years ago)

Author:

lancewillett

Message:

Twenty Thirteen: improve gallery styles to ensure both single and index views are displayed consistently. Closes #24555.

Location:

trunk/wp-content/themes/twentythirteen

Files:

• functions.php (modified) (1 diff)
• rtl.css (modified) (4 diffs)
• style.css (modified) (5 diffs)

trunk/wp-content/themes/twentythirteen/functions.php

@@ -502 +502 @@
 
 /**
- * Sets the image size in featured galleries to large.
- *
- * @since Twenty Thirteen 1.0
- *
- * @param array $atts Combined and filtered attribute list.
- * @return array The filtered attribute list.
- */
-function twentythirteen_gallery_atts( $atts ) {
-    if ( has_post_format( 'gallery' ) && ! is_single() )
-        $atts['size'] = wp_is_mobile() ? 'thumbnail' : 'medium';
-
-    return $atts;
-}
-add_filter( 'shortcode_atts_gallery', 'twentythirteen_gallery_atts' );
-
-/**
  * Extends the default WordPress body classes.
  *

trunk/wp-content/themes/twentythirteen/rtl.css

@@ -262 +262 @@
 }
 
-.blog .format-gallery .gallery-item,
-.archive .format-gallery .gallery-item,
-.search .format-gallery .gallery-item {
-    margin-left: 4px;
-    margin-right: auto;
-}
-.blog .format-gallery .gallery-item img,
-.archive .format-gallery .gallery-item img,
-.search .format-gallery .gallery-item img {
-    position: absolute;
-    left: 0;
-}
-
 .format-image .wp-caption-text {
     text-align: right;
@@ -727 +714 @@
     }
 
-    .single .gallery-columns-3 .gallery-item:nth-of-type(3n) {
+    .gallery-columns-3 .gallery-item:nth-of-type(3n) {
         margin-left: 4px;
         margin-right: auto;
@@ -739 +726 @@
     }
 
+    .gallery .gallery-item:nth-of-type(even) {
+        margin-left: 0;
+        margin-right: auto;
+    }
+
     .gallery .gallery-item,
-    .single .gallery-columns-2.gallery-size-thumbnail .gallery-item,
-    .blog .format-gallery .gallery-item,
-    .archive .format-gallery .gallery-item,
-    .search .format-gallery .gallery-item,
-    .single .gallery.gallery-columns-3 .gallery-item:nth-of-type(even),
+    .gallery.gallery-columns-3 .gallery-item:nth-of-type(even),
     .gallery-columns-3 .gallery-item:nth-of-type(3n),
     .gallery-columns-5 .gallery-item:nth-of-type(5n),
@@ -753 +741 @@
     }
 
-    .blog .format-gallery .gallery-item:nth-of-type(odd),
-    .archive .format-gallery .gallery-item:nth-of-type(odd),
-    .search .format-gallery .gallery-item:nth-of-type(odd),
-    .single .gallery .gallery-item:nth-of-type(even) {
-        margin-left: 0;
-        margin-right: auto;
-    }
-
     .comment-author .avatar {
         margin-left: 5px;

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

@@ -1233 +1233 @@
 }
 
-.gallery-columns-1 .gallery-item {
-    max-width: 100%;
-}
-
-.gallery-columns-2 .gallery-item {
-    max-width: 48%;
-    max-width: -webkit-calc(50% - 4px);
-    max-width:         calc(50% - 4px);
-    text-align: center;
-}
-
+.gallery-columns-1 .gallery-item,
+.gallery-columns-2 .gallery-item,
 .gallery-columns-3 .gallery-item {
-    max-width: 31%;
-    max-width: -webkit-calc(33.3% - 4px);
-    max-width:         calc(33.3% - 4px);
     text-align: center;
 }
@@ -1480 +1468 @@
 .format-gallery .entry-content a {
     color: #722d19;
-}
-
-/* Blog gallery */
-.blog .format-gallery .gallery,
-.archive .format-gallery .gallery,
-.search .format-gallery .gallery {
-    margin-bottom: 20px;
-    margin-left: -4px;
-    max-width: 608px;
-}
-
-.blog .format-gallery .gallery-item,
-.archive .format-gallery .gallery-item,
-.search .format-gallery .gallery-item {
-    display: block;
-    height: 148px;
-    margin-right: 4px;
-    max-height: 100%;
-    max-width: 100%;
-    overflow: hidden;
-    width: 148px;
-}
-
-.blog .format-gallery .gallery-item img,
-.archive .format-gallery .gallery-item img,
-.search .format-gallery .gallery-item img {
-    height: 100%;
-    max-height: 148px;
-    max-width: none;
-    width: auto;
-}
-
-.blog .format-gallery .gallery-item .portrait img,
-.archive .format-gallery .gallery-item .portrait img,
-.search .format-gallery .gallery-item .portrait img {
-    height: auto;
-    max-height: none;
-    max-width: 148px;
-    width: 100%;
-}
-
-.blog .format-gallery .gallery-item:first-child,
-.archive .format-gallery .gallery-item:first-child,
-.search .format-gallery .gallery-item:first-child {
-    height: 300px;
-    width: 300px;
-}
-
-.blog .format-gallery .gallery-item:first-child img,
-.archive .format-gallery .gallery-item:first-child img,
-.search .format-gallery .gallery-item:first-child img {
-    max-height: 300px;
-}
-
-.blog .format-gallery .gallery-item:first-child .portrait img,
-.archive .format-gallery .gallery-item:first-child .portrait img,
-.search .format-gallery .gallery-item:first-child .portrait img {
-    max-height: none;
-    max-width: 300px;
-}
-
-.blog .format-gallery .gallery-item .gallery-icon,
-.archive .format-gallery .gallery-item .gallery-icon,
-.search .format-gallery .gallery-item .gallery-icon {
-    height: 100%;
-    -webkit-transform: translate(50%, 50%);
-    -ms-transform:     translate(50%, 50%);
-    transform:         translate(50%, 50%);
-    width: 100%;
-}
-
-.blog .format-gallery .gallery-item .gallery-icon img,
-.archive .format-gallery .gallery-item .gallery-icon img,
-.search .format-gallery .gallery-item .gallery-icon img {
-    -webkit-transform: translate(-50%, -50%);
-    -ms-transform:     translate(-50%, -50%);
-    transform:         translate(-50%, -50%);
-}
-
-.blog .format-gallery .gallery br,
-.archive .format-gallery .gallery br,
-.search .format-gallery .gallery br {
-    display: none;
 }
 
@@ -3013 +2918 @@
 
     .gallery .gallery-item,
-    .single .gallery-columns-2.gallery-size-thumbnail .gallery-item,
-    .blog .format-gallery .gallery-item,
-    .archive .format-gallery .gallery-item,
-    .search .format-gallery .gallery-item {
+    .gallery-columns-2.gallery-size-thumbnail .gallery-item {
         max-width: none;
         width: 49%;
@@ -3023 +2925 @@
     }
 
-    .single .gallery-columns-1.gallery-size-medium,
-    .single .gallery-columns-1.gallery-size-thumbnail,
-    .single .gallery-columns-2.gallery-size-thumbnail,
-    .single .gallery-columns-3.gallery-size-thumbnail {
+    .gallery-columns-1.gallery-size-medium,
+    .gallery-columns-1.gallery-size-thumbnail,
+    .gallery-columns-2.gallery-size-thumbnail,
+    .gallery-columns-3.gallery-size-thumbnail {
         display: block;
     }
 
     .gallery-columns-1 .gallery-item,
-    .single .gallery-columns-1.gallery-size-medium .gallery-item,
-    .single .gallery-columns-1.gallery-size-thumbnail .gallery-item,
-    .blog .format-gallery .gallery-item:first-child,
-    .archive .format-gallery .gallery-item:first-child,
-    .search .format-gallery .gallery-item:first-child {
+    .gallery-columns-1.gallery-size-medium .gallery-item,
+    .gallery-columns-1.gallery-size-thumbnail .gallery-item {
         text-align: center;
         width: 98%;
@@ -3053 +2952 @@
     }
 
-    .blog .format-gallery .gallery-item:nth-of-type(odd),
-    .archive .format-gallery .gallery-item:nth-of-type(odd),
-    .search .format-gallery .gallery-item:nth-of-type(odd),
-    .single .gallery .gallery-item:nth-of-type(even) {
+    .gallery .gallery-item:nth-of-type(even) {
         margin-right: 0;
     }