<!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>[30230] trunk/src/wp-content/themes/twentyfifteen: Twenty Fifteen: Simplify the header, sidebar, background controls and make customization faster for users to do.</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/30230">30230</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/30230","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-04 18:41:56 +0000 (Tue, 04 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: Simplify the header, sidebar, background controls and make customization faster for users to do. This has the added benefit of fixing our bug where hidden header text wasn't being updated on color scheme switch. Nice.
Props celloexpressions, iamtakashi, fixes <a href="https://core.trac.wordpress.org/ticket/30164">#30164</a> and <a href="https://core.trac.wordpress.org/ticket/29980">#29980</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>
<li><a href="#trunksrcwpcontentthemestwentyfifteeninccustomizerphp">trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteenjscolorschemecontroljs">trunk/src/wp-content/themes/twentyfifteen/js/color-scheme-control.js</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-04 17:40:45 UTC (rev 30229)
+++ trunk/src/wp-content/themes/twentyfifteen/css/admin-custom-header.css 2014-11-04 18:41:56 UTC (rev 30230)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,6 +34,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> opacity: 0.7;
</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">+/* Hide the header text color option */
+.appearance_page_custom-header tr.displaying-header-text {
+ display: none;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> @media screen and (min-width: 772px) {
</span><span class="cx" style="display: block; padding: 0 10px"> #headimg h1 {
</span><span class="cx" style="display: block; padding: 0 10px"> font-size: 29px;
</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-04 17:40:45 UTC (rev 30229)
+++ trunk/src/wp-content/themes/twentyfifteen/inc/custom-header.php 2014-11-04 18:41:56 UTC (rev 30230)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,10 +79,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_header_style() {
</span><span class="cx" style="display: block; padding: 0 10px"> $header_image = get_header_image();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $text_color = get_header_textcolor();
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If no custom options for text are set, let's bail.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $header_image ) && $text_color == get_theme_support( 'custom-header', 'default-text-color' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $header_image ) && display_header_text() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,16 +124,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> clip: rect(1px, 1px, 1px, 1px);
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- // If the user has set a custom color for the text use that
- elseif ( $text_color != get_theme_support( 'custom-header', 'default-text-color' ) ) :
- ?>
- .site-title a,
- .site-title a:hover,
- .site-title a:focus,
- .site-description {
- color: #<?php echo esc_attr( $text_color ); ?>;
- }
</del><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </style>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,10 +217,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $css = '
</span><span class="cx" style="display: block; padding: 0 10px"> /* Custom Sidebar Text Color */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .site-title a,
+ .site-description,
</ins><span class="cx" style="display: block; padding: 0 10px"> .secondary-toggle:before {
</span><span class="cx" style="display: block; padding: 0 10px"> color: %1$s;
</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">+ .site-title a:hover,
+ .site-title a:focus {
+ color: %1$s; /* Fallback for IE7 and IE8 */
+ color: %2$s;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .secondary-toggle {
</span><span class="cx" style="display: block; padding: 0 10px"> border-color: %1$s; /* Fallback for IE7 and IE8 */
</span><span class="cx" style="display: block; padding: 0 10px"> border-color: %3$s;
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteeninccustomizerphp"></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/customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php 2014-11-04 17:40:45 UTC (rev 30229)
+++ trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php 2014-11-04 18:41:56 UTC (rev 30230)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,25 +35,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</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 custom sidebar text color setting and control.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add custom header and sidebar text color setting and control.
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting( 'sidebar_textcolor', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => $color_scheme[4],
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'sanitize_hex_color',
</span><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"> $wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'sidebar_textcolor', array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => __( 'Sidebar Text Color', 'twentyfifteen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html__( 'Header & Sidebar Text Color', 'twentyfifteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> ) ) );
</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 custom header background color setting and control.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove the core header textcolor control, as it shares the sidebar text color.
+ $wp_customize->remove_control( 'header_textcolor' );
+
+ // Add custom header and sidebar background color setting and control.
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_setting( 'header_background_color', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => $color_scheme[1],
</span><span class="cx" style="display: block; padding: 0 10px"> 'sanitize_callback' => 'sanitize_hex_color',
</span><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"> $wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'header_background_color', array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => esc_html__( 'Header & Sidebar Background Color', 'twentyfifteen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html__( 'Header & Sidebar Background Color', 'twentyfifteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteenjscolorschemecontroljs"></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/js/color-scheme-control.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/js/color-scheme-control.js 2014-11-04 17:40:45 UTC (rev 30229)
+++ trunk/src/wp-content/themes/twentyfifteen/js/color-scheme-control.js 2014-11-04 18:41:56 UTC (rev 30230)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,14 +10,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ready: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'color_scheme' === this.id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> this.setting.bind( 'change', function( value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If Header Text is not hidden, update value.
- if ( 'blank' !== api( 'header_textcolor' ).get() ) {
- api( 'header_textcolor' ).set( colorScheme[value].colors[4] );
- api.control( 'header_textcolor' ).container.find( '.color-picker-hex' )
- .data( 'data-default-color', colorScheme[value].colors[4] )
- .wpColorPicker( 'defaultColor', colorScheme[value].colors[4] );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Update Background Color.
</span><span class="cx" style="display: block; padding: 0 10px"> api( 'background_color' ).set( colorScheme[value].colors[0] );
</span><span class="cx" style="display: block; padding: 0 10px"> api.control( 'background_color' ).container.find( '.color-picker-hex' )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .data( 'data-default-color', colorScheme[value].colors[1] )
</span><span class="cx" style="display: block; padding: 0 10px"> .wpColorPicker( 'defaultColor', colorScheme[value].colors[1] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Update Sidebar Text Color.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update Header/Sidebar Text Color.
</ins><span class="cx" style="display: block; padding: 0 10px"> api( 'sidebar_textcolor' ).set( colorScheme[value].colors[4] );
</span><span class="cx" style="display: block; padding: 0 10px"> api.control( 'sidebar_textcolor' ).container.find( '.color-picker-hex' )
</span><span class="cx" style="display: block; padding: 0 10px"> .data( 'data-default-color', colorScheme[value].colors[4] )
</span></span></pre>
</div>
</div>
</body>
</html>