Changeset 36913

Timestamp:

03/09/2016 11:01:53 PM (5 years ago)

Author:

karmatosed

Message:

Twenty Fifteen: add support for site logos
Fixes #35944
Props @iamtakashi, @celloexpressions, @drebbits.web

Location:

trunk/src/wp-content/themes/twentyfifteen

Files:

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

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

@@ -103 +103 @@
         'aside', 'image', 'video', 'quote', 'link', 'gallery', 'status', 'audio', 'chat'
     ) );
+
+    /*
+     * Enable support for custom logo.
+     *
+     * @since Twenty Fifteen 1.5
+     */
+    add_image_size( 'twentyfifteen-logo', 248, 248 );
+    add_theme_support( 'custom-logo', array( 'size' => 'twentyfifteen-logo' ) );
 
     $color_scheme  = twentyfifteen_get_color_scheme();

trunk/src/wp-content/themes/twentyfifteen/header.php

@@ -30 +30 @@
             <div class="site-branding">
                 <?php
+                    twentyfifteen_the_custom_logo();
+
                     if ( is_front_page() && is_home() ) : ?>
                         <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>

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

@@ -242 +242 @@
 add_filter( 'excerpt_more', 'twentyfifteen_excerpt_more' );
 endif;
+
+if ( ! function_exists( 'twentyfifteen_the_custom_logo' ) ) :
+/**
+ * Displays the optional custom logo.
+ *
+ * Returns early if the custom logo is not available.
+ *
+ * @since Twenty Fifteen 1.5
+ */
+function twentyfifteen_the_custom_logo() {
+    if ( ! function_exists( 'the_custom_logo' ) ) {
+        return;
+    } else {
+        the_custom_logo();
+    }
+}
+endif;

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

@@ -1317 +1317 @@
 }
 
+.custom-logo {
+    max-height: 84px;
+    width: auto;
+}
+
+.wp-custom-logo .site-title {
+    margin-top: 0.545454545em;
+}
+
 .site-description {
     display: none;
@@ -3090 +3099 @@
     }
 
+    .custom-logo {
+        max-height: 105px;
+    }
+
+    .wp-custom-logo .site-title {
+        margin-top: 0.482758621em;
+    }
+
     .site-description {
         font-size: 14px;
@@ -3712 +3729 @@
     }
 
+    .custom-logo {
+        max-height: 104px;
+    }
+
+    .wp-custom-logo .site-title {
+        margin-top: 0.5em;
+    }
+
     .site-description {
         font-size: 16px;
@@ -4347 +4372 @@
     }
 
+    .custom-logo {
+        max-height: none;
+    }
+
+    .wp-custom-logo .site-title {
+        margin-top: 0.545454545em;
+    }
+
     .site-description {
         font-size: 12px;
@@ -4966 +4999 @@
     }
 
+    .wp-custom-logo .site-title {
+        margin-top: 0.583333333em;
+    }
+
     .site-description {
         font-size: 14px;
@@ -5504 +5541 @@
     }
 
+    .wp-custom-logo .site-title {
+        margin-top: 0.592592593em;
+    }
+
     .site-description {
         font-size: 16px;