<!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>[23568] trunk/wp-content/themes/twentytwelve: Twenty Twelve: better handling for cases where a background color is set to white or an empty value (like first run with no `theme_mods` set) and a background image is enabled, which resulted previously in a broken layout.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/23568">23568</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-03-01 17:14:59 +0000 (Fri, 01 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Twelve: better handling for cases where a background color is set to white or an empty value (like first run with no `theme_mods` set) and a background image is enabled, which resulted previously in a broken layout. Fixes <a href="http://core.trac.wordpress.org/ticket/23586">#23586</a>, props obenland.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelvefunctionsphp">trunk/wp-content/themes/twentytwelve/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvejsthemecustomizerjs">trunk/wp-content/themes/twentytwelve/js/theme-customizer.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytwelvefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/functions.php (23567 => 23568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/functions.php 2013-03-01 17:14:09 UTC (rev 23567)
+++ trunk/wp-content/themes/twentytwelve/functions.php 2013-03-01 17:14:59 UTC (rev 23568)
</span><span class="lines">@@ -383,6 +383,7 @@
</span><span class="cx"> */
</span><span class="cx"> function twentytwelve_body_class( $classes ) {
</span><span class="cx"> $background_color = get_background_color();
</span><ins>+ $background_image = get_background_image();
</ins><span class="cx">
</span><span class="cx"> if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'page-templates/full-width.php' ) )
</span><span class="cx"> $classes[] = 'full-width';
</span><span class="lines">@@ -395,10 +396,12 @@
</span><span class="cx"> $classes[] = 'two-sidebars';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( empty( $background_color ) )
- $classes[] = 'custom-background-empty';
- elseif ( in_array( $background_color, array( 'fff', 'ffffff' ) ) )
- $classes[] = 'custom-background-white';
</del><ins>+ if ( empty( $background_image ) ) {
+ if ( empty( $background_color ) )
+ $classes[] = 'custom-background-empty';
+ elseif ( in_array( $background_color, array( 'fff', 'ffffff' ) ) )
+ $classes[] = 'custom-background-white';
+ }
</ins><span class="cx">
</span><span class="cx"> // Enable custom font class only if the font CSS is queued to load.
</span><span class="cx"> if ( wp_style_is( 'twentytwelve-fonts', 'queue' ) )
</span><span class="lines">@@ -445,6 +448,6 @@
</span><span class="cx"> * @since Twenty Twelve 1.0
</span><span class="cx"> */
</span><span class="cx"> function twentytwelve_customize_preview_js() {
</span><del>- wp_enqueue_script( 'twentytwelve-customizer', get_template_directory_uri() . '/js/theme-customizer.js', array( 'customize-preview' ), '20120827', true );
</del><ins>+ wp_enqueue_script( 'twentytwelve-customizer', get_template_directory_uri() . '/js/theme-customizer.js', array( 'customize-preview' ), '20130301', true );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'customize_preview_init', 'twentytwelve_customize_preview_js' );
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvejsthemecustomizerjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/js/theme-customizer.js (23567 => 23568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/js/theme-customizer.js 2013-03-01 17:14:09 UTC (rev 23567)
+++ trunk/wp-content/themes/twentytwelve/js/theme-customizer.js 2013-03-01 17:14:59 UTC (rev 23568)
</span><span class="lines">@@ -18,15 +18,29 @@
</span><span class="cx"> } );
</span><span class="cx"> } );
</span><span class="cx">
</span><del>- // Hook into background color change and adjust body class value as needed.
</del><ins>+ // Hook into background color/image change and adjust body class value as needed.
</ins><span class="cx"> wp.customize( 'background_color', function( value ) {
</span><span class="cx"> value.bind( function( to ) {
</span><del>- if ( '#ffffff' == to || '#fff' == to )
- $( 'body' ).addClass( 'custom-background-white' );
- else if ( '' == to )
- $( 'body' ).addClass( 'custom-background-empty' );
</del><ins>+ var body = $( 'body' );
+
+ if ( ( '#ffffff' == to || '#fff' == to ) && 'none' == body.css( 'background-image' ) )
+ body.addClass( 'custom-background-white' );
+ else if ( '' == to && 'none' == body.css( 'background-image' ) )
+ body.addClass( 'custom-background-empty' );
</ins><span class="cx"> else
</span><del>- $( 'body' ).removeClass( 'custom-background-empty custom-background-white' );
</del><ins>+ body.removeClass( 'custom-background-empty custom-background-white' );
</ins><span class="cx"> } );
</span><span class="cx"> } );
</span><del>-} )( jQuery );
</del><span class="cx">\ No newline at end of file
</span><ins>+ wp.customize( 'background_image', function( value ) {
+ value.bind( function( to ) {
+ var body = $( 'body' );
+
+ if ( '' != to )
+ body.removeClass( 'custom-background-empty custom-background-white' );
+ else if ( 'rgb(255, 255, 255)' == body.css( 'background-color' ) )
+ body.addClass( 'custom-background-white' );
+ else if ( 'rgb(230, 230, 230)' == body.css( 'background-color' ) && '' == _wpCustomizeSettings.values.background_color )
+ body.addClass( 'custom-background-empty' );
+ } );
+ } );
+} )( jQuery );
</ins></span></pre>
</div>
</div>
</body>
</html>