From 078e3aecad45c8d0eaeb7c36e146d1491a3be4b2 Mon Sep 17 00:00:00 2001
From: "David A. Kennedy" <me@davidakennedy.com>
Date: Fri, 23 Jun 2017 13:07:33 -0400
Subject: [PATCH 1/2] Remove call to `_s_categorized_blog()`

* It was removed in #1131.
---
 404.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/404.php b/404.php
index 4e6debe8..682d1896 100644
--- a/404.php
+++ b/404.php
@@ -24,9 +24,6 @@ get_header(); ?>
 						get_search_form();
 
 						the_widget( 'WP_Widget_Recent_Posts' );
-
-						// Only show the widget if site has multiple categories.
-						if ( _s_categorized_blog() ) :
 					?>
 
 					<div class="widget widget_categories">
@@ -45,7 +42,6 @@ get_header(); ?>
 					</div><!-- .widget -->
 
 					<?php
-						endif;
 
 						/* translators: %1$s: smiley */
 						$archive_content = '<p>' . sprintf( esc_html__( 'Try looking in the monthly archives. %1$s', '_s' ), convert_smilies( ':)' ) ) . '</p>';

From 2bef512355f62ebc6806888c6aaff2ce7fbbc540 Mon Sep 17 00:00:00 2001
From: "David A. Kennedy" <me@davidakennedy.com>
Date: Mon, 26 Jun 2017 18:47:12 -0400
Subject: [PATCH 2/2] _s: Add basic custom logo support

See: https://codex.wordpress.org/Theme_Logo

Closes #922
---
 functions.php          | 12 ++++++++++++
 header.php             |  1 +
 sass/media/_media.scss |  5 +++++
 style.css              |  5 +++++
 4 files changed, 23 insertions(+)

diff --git a/functions.php b/functions.php
index c68a5f52..ded25f5c 100644
--- a/functions.php
+++ b/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' );
diff --git a/header.php b/header.php
index da215447..ef0fa423 100644
--- a/header.php
+++ b/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 : ?>
diff --git a/sass/media/_media.scss b/sass/media/_media.scss
index 198535d6..0f2f32b2 100644
--- a/sass/media/_media.scss
+++ b/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
 --------------------------------------------------------------*/
diff --git a/style.css b/style.css
index 14a7930d..c8362c0c 100644
--- a/style.css
+++ b/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
 --------------------------------------------------------------*/