<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[36913] trunk/src/wp-content/themes/twentyfifteen: Twenty Fifteen: add support for site logos</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/36913">36913</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/36913","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>karmatosed</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-03-09 23:01:53 +0000 (Wed, 09 Mar 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Twenty Fifteen: add support for site logos
Fixes <a href="https://core.trac.wordpress.org/ticket/35944">#35944</a>
Props @iamtakashi, @celloexpressions, @drebbits.web</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfifteenfunctionsphp">trunk/src/wp-content/themes/twentyfifteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteenheaderphp">trunk/src/wp-content/themes/twentyfifteen/header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteeninctemplatetagsphp">trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteenstylecss">trunk/src/wp-content/themes/twentyfifteen/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfifteenfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/functions.php 2016-03-09 22:02:06 UTC (rev 36912)
+++ trunk/src/wp-content/themes/twentyfifteen/functions.php 2016-03-09 23:01:53 UTC (rev 36913)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,6 +103,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'aside', 'image', 'video', 'quote', 'link', 'gallery', 'status', 'audio', 'chat'
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * 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' ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $color_scheme = twentyfifteen_get_color_scheme();
</span><span class="cx" style="display: block; padding: 0 10px"> $default_color = trim( $color_scheme[0], '#' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteenheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/header.php 2016-03-09 22:02:06 UTC (rev 36912)
+++ trunk/src/wp-content/themes/twentyfifteen/header.php 2016-03-09 23:01:53 UTC (rev 36913)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,6 +29,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <header id="masthead" class="site-header" role="banner">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="site-branding">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ twentyfifteen_the_custom_logo();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_front_page() && is_home() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteeninctemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php 2016-03-09 22:02:06 UTC (rev 36912)
+++ trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php 2016-03-09 23:01:53 UTC (rev 36913)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,3 +241,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'excerpt_more', 'twentyfifteen_excerpt_more' );
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+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;
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteenstylecss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfifteen/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/style.css 2016-03-09 22:02:06 UTC (rev 36912)
+++ trunk/src/wp-content/themes/twentyfifteen/style.css 2016-03-09 23:01:53 UTC (rev 36913)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1316,6 +1316,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.custom-logo {
+ max-height: 84px;
+ width: auto;
+}
+
+.wp-custom-logo .site-title {
+ margin-top: 0.545454545em;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .site-description {
</span><span class="cx" style="display: block; padding: 0 10px"> display: none;
</span><span class="cx" style="display: block; padding: 0 10px"> font-family: "Noto Sans", sans-serif;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3089,6 +3098,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 1.2069;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .custom-logo {
+ max-height: 105px;
+ }
+
+ .wp-custom-logo .site-title {
+ margin-top: 0.482758621em;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .site-description {
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 14px;
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 1.4rem;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3711,6 +3728,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 1.25;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .custom-logo {
+ max-height: 104px;
+ }
+
+ .wp-custom-logo .site-title {
+ margin-top: 0.5em;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .site-description {
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 16px;
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 1.6rem;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4346,6 +4371,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 1.3636;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .custom-logo {
+ max-height: none;
+ }
+
+ .wp-custom-logo .site-title {
+ margin-top: 0.545454545em;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .site-description {
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 12px;
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 1.2rem;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4965,6 +4998,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 1.1667;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .wp-custom-logo .site-title {
+ margin-top: 0.583333333em;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .site-description {
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 14px;
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 1.4rem;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5503,6 +5540,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 1.1852;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .wp-custom-logo .site-title {
+ margin-top: 0.592592593em;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .site-description {
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 16px;
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 1.6rem;
</span></span></pre>
</div>
</div>
</body>
</html>