<!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>[30567] trunk/src/wp-content/themes/twentyfifteen: Twenty Fifteen: remove unneeded custom header admin callbacks.</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/30567">30567</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/30567","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandstewart</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-11-25 15:11:11 +0000 (Tue, 25 Nov 2014)</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: remove unneeded custom header admin callbacks.
Props philiparthurmoore, fixes <a href="https://core.trac.wordpress.org/ticket/30432">#30432</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfifteencssadmincustomheadercss">trunk/src/wp-content/themes/twentyfifteen/css/admin-custom-header.css</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteeninccustomheaderphp">trunk/src/wp-content/themes/twentyfifteen/inc/custom-header.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfifteencssadmincustomheadercss"></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/css/admin-custom-header.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/css/admin-custom-header.css 2014-11-25 15:03:49 UTC (rev 30566)
+++ trunk/src/wp-content/themes/twentyfifteen/css/admin-custom-header.css 2014-11-25 15:11:11 UTC (rev 30567)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,112 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*
-Theme Name: Twenty Fifteen
-Description: Used to style the header image displayed on the Appearance > Header screen.
-*/
-
-.appearance_page_custom-header #headimg {
- background: #fff no-repeat 50% 50%;
- background-size: cover;
- border: none;
- box-sizing: border-box;
- padding: 7.6923%;
-}
-
-#headimg h1,
-#desc {
- color: #333;
- font-family: "Noto Sans", sans-serif;
-}
-
-#headimg h1 {
- font-size: 22px;
- line-height: 1.0909;
- margin: 0;
-}
-
-#headimg h1 a {
- text-decoration: none;
-}
-
-#desc {
- font-size: 12px;
- line-height: 1.5;
- margin-top: 0.5em;
- opacity: 0.7;
-}
-
-/* Hide the header text color option */
-.appearance_page_custom-header tr.displaying-header-text,
-.appearance_page_custom-header tr.displaying-header-text td,
-.appearance_page_custom-header tr.displaying-header-text th {
- display: none;
-}
-
-@media screen and (min-width: 772px) {
- #headimg h1 {
- font-size: 29px;
- line-height: 1.2069;
- margin: 0;
- }
-
- #desc {
- font-size: 14px;
- }
-}
-
-@media screen and (min-width: 783px) {
- #headimg h1 {
- font-size: 22px;
- line-height: 1.0909;
- }
-
- #desc {
- font-size: 12px;
- line-height: 1.5;
- margin-top: 0.5em;
- }
-}
-
-@media screen and (min-width: 1172px) {
- #headimg h1 {
- font-size: 29px;
- line-height: 1.2069;
- }
-
- #desc {
- font-size: 14px;
- }
-}
-
-@media screen and (min-width: 1313px) {
- #headimg h1 {
- font-size: 32px;
- line-height: 1.25;
- }
-
- #desc {
- font-size: 16px;
- }
-}
-
-@media screen and (min-width: 1383px) {
- .appearance_page_custom-header #headimg {
- background-position: 100% 50%;
- height: 1300px;
- max-width: 954px;
- padding: 83px 83px 0 0;
- width: 42%;
- }
-
- #headimg h1 {
- float: right;
- font-size: 27px;
- line-height: 1.1852;
- width: 248px;
- }
-
- #desc {
- clear: right;
- float: right;
- width: 248px;
- }
-}
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteeninccustomheaderphp"></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/custom-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/inc/custom-header.php 2014-11-25 15:03:49 UTC (rev 30566)
+++ trunk/src/wp-content/themes/twentyfifteen/inc/custom-header.php 2014-11-25 15:11:11 UTC (rev 30567)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Set up the WordPress core custom header feature.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses twentyfifteen_header_style()
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @uses twentyfifteen_admin_header_image()
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_custom_header_setup() {
</span><span class="cx" style="display: block; padding: 0 10px"> $color_scheme = twentyfifteen_get_color_scheme();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,8 +29,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type int $height Height in pixels of the custom header image. Default 1300.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $wp-head-callback Callback function used to styles the header image and text
</span><span class="cx" style="display: block; padding: 0 10px"> * displayed on the blog.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $admin-preview-callback Callback function used to create the custom header markup in
- * the Appearance > Header screen.
</del><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'custom-header', apply_filters( 'twentyfifteen_custom_header_args', array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +36,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 954,
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 1300,
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-head-callback' => 'twentyfifteen_header_style',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'admin-preview-callback' => 'twentyfifteen_admin_header_image',
</del><span class="cx" style="display: block; padding: 0 10px"> ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'after_setup_theme', 'twentyfifteen_custom_header_setup' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,27 +169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // twentyfifteen_header_style
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! function_exists( 'twentyfifteen_admin_header_image' ) ) :
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Custom header image markup displayed on the Appearance > Header admin panel.
- *
- * @since Twenty Fifteen 1.0
- * @see twentyfifteen_custom_header_setup().
- */
-function twentyfifteen_admin_header_image() {
- $style = sprintf( ' style="color: #%s;"', esc_attr( get_header_textcolor() ) );
- $color_scheme = twentyfifteen_get_color_scheme();
- $header_background_color = get_theme_mod( 'header_background_color', $color_scheme[1] );
-?>
- <div id="headimg" style="background-image: url(<?php header_image(); ?>); background-color: <?php echo esc_attr( $header_background_color ); ?>;">
- <h1 class="displaying-header-text"><a id="name"<?php echo $style; ?> onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
- <div id="desc" class="displaying-header-text"<?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
- </div>
-<?php
-}
-endif; // twentyfifteen_admin_header_image
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Enqueues front-end CSS for the header background color.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since Twenty Fifteen 1.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -373,15 +349,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_inline_style( 'twentyfifteen-style', sprintf( $css, $sidebar_link_color, $sidebar_text_color, $sidebar_border_color, $sidebar_border_focus_color ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'wp_enqueue_scripts', 'twentyfifteen_sidebar_text_color_css', 11 );
-
-/**
- * Enqueue styles to admin screen for custom header display.
- *
- * @since Twenty Fifteen 1.0
- */
-function twentyfifteen_admin_fonts() {
- wp_enqueue_style( 'twentyfifteen-fonts', twentyfifteen_fonts_url(), array(), null );
- wp_enqueue_style( 'twentyfifteen-custom-header', get_template_directory_uri() . '/css/admin-custom-header.css', array(), '20141010' );
-}
-add_action( 'admin_print_scripts-appearance_page_custom-header', 'twentyfifteen_admin_fonts' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'wp_enqueue_scripts', 'twentyfifteen_sidebar_text_color_css', 11 );
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>