Merge pull request #1136 from Automattic/feature/add-logo-support

_s: Add basic custom logo support

functions.php

@@ -67,6 +67,18 @@ function _s_setup() {
 
 	// Add theme support for selective refresh for widgets.
 	add_theme_support( 'customize-selective-refresh-widgets' );
+
+	/**
+	 * Add support for core custom logo.
+	 *
+	 * @link https://codex.wordpress.org/Theme_Logo
+	 */
+	add_theme_support( 'custom-logo', array(
+		'height'      => 250,
+		'width'       => 250,
+		'flex-width'  => true,
+		'flex-height' => true,
+	) );
 }
 endif;
 add_action( 'after_setup_theme', '_s_setup' );

header.php

@@ -26,6 +26,7 @@
 	<header id="masthead" class="site-header">
 		<div class="site-branding">
 			<?php
+			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>
 			<?php else : ?>

sass/media/_media.scss

@@ -14,6 +14,11 @@ object {
 	max-width: 100%;
 }
 
+/* Make sure logo link wraps around logo image. */
+.custom-logo-link{
+	display: inline-block;
+}
+
 /*--------------------------------------------------------------
 ## Captions
 --------------------------------------------------------------*/

style.css

@@ -817,6 +817,11 @@ object {
 	max-width: 100%;
 }
 
+/* Make sure logo link wraps around logo image. */
+.custom-logo-link{
+	display: inline-block;
+}
+
 /*--------------------------------------------------------------
 ## Captions
 --------------------------------------------------------------*/