Ticket #24128: 24128.3.diff

wp-content/themes/twentyeleven/functions.php

@@ -251 +251 @@
         ?>
                 #site-title,
                 #site-description {
-                        position: absolute !important;
+                        position: absolute;
                         clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
                         clip: rect(1px, 1px, 1px, 1px);
                 }
@@ -261 +261 @@
         ?>
                 #site-title a,
                 #site-description {
-                        color: #<?php echo $text_color; ?> !important;
+                        color: #<?php echo $text_color; ?>;
                 }
         <?php endif; ?>
         </style>

wp-content/themes/twentyeleven/header.php

@@ -44 +44 @@
 
         ?></title>
 <link rel="profile" href="http://gmpg.org/xfn/11" />
-<link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
+<link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>?v=20130419" />
 <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
 <!--[if lt IE 9]>
 <script src="<?php echo get_template_directory_uri(); ?>/js/html5.js" type="text/javascript"></script>
@@ -117 +117 @@
                         <?php endif; // end check for removed header image ?>
 
                         <?php
-                                // Has the text been hidden?
-                                if ( 'blank' == get_header_textcolor() ) :
+                                $search_classes = array();
+
+                                if ( $header_image )
+                                        $search_classes[] = 'with-image';
+
+                                if ( 'blank' == get_header_textcolor() )
+                                        $search_classes[] = 'only-search';
+
+                                $search_classes = implode( ' ', $search_classes );
                         ?>
-                                <div class="only-search<?php if ( $header_image ) : ?> with-image<?php endif; ?>">
+                        <div class="<?php echo esc_attr( $search_classes ); ?>">
                                 <?php get_search_form(); ?>
-                                </div>
-                        <?php
-                                else :
-                        ?>
-                                <?php get_search_form(); ?>
-                        <?php endif; ?>
+                        </div>
 
                         <nav id="access" role="navigation">
                                 <h3 class="assistive-text"><?php _e( 'Main menu', 'twentyeleven' ); ?></h3>

wp-content/themes/twentyeleven/inc/theme-customizer.js

@@ -9 +9 @@
                         $( '#site-description' ).text( to );
                 } );
         } );
+
+        // Header text color
+        wp.customize( 'header_textcolor', function( value ) {
+                value.bind( function( to ) {
+                        if ( 'blank' === to ) {
+                                $( '#site-title, #site-title a, #site-description' ).css( {
+                                        'clip': 'rect(1px, 1px, 1px, 1px)',
+                                        'position': 'absolute'
+                                } );
+                                $( '#branding' ).find( '#searchform' ).parent().addClass('only-search');
+                        } else {
+                                $( '#site-title, #site-title a, #site-description' ).css( {
+                                        'clip': 'auto',
+                                        'color': to,
+                                        'position': 'relative'
+                                } );
+                                $( '#branding' ).find( '#searchform' ).parent().removeClass('only-search');
+                        }
+                } );
+        } );
 } )( jQuery );
+ No newline at end of file

wp-content/themes/twentyeleven/inc/theme-options.php

@@ -508 +508 @@
 function twentyeleven_customize_register( $wp_customize ) {
         $wp_customize->get_setting( 'blogname' )->transport = 'postMessage';
         $wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
+        $wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
 
         $options  = twentyeleven_get_theme_options();
         $defaults = twentyeleven_get_default_theme_options();
@@ -581 +582 @@
  * @since Twenty Eleven 1.3
  */
 function twentyeleven_customize_preview_js() {
-        wp_enqueue_script( 'twentyeleven-customizer', get_template_directory_uri() . '/inc/theme-customizer.js', array( 'customize-preview' ), '20120523', true );
+        wp_enqueue_script( 'twentyeleven-customizer', get_template_directory_uri() . '/inc/theme-customizer.js', array( 'customize-preview' ), '20130419', true );
 }
 add_action( 'customize_preview_init', 'twentyeleven_customize_preview_js' );
+ No newline at end of file

wp-content/themes/twentyeleven/style.css

@@ -681 +681 @@
 #branding .only-search #s:focus {
         background-color: #bbb;
 }
-#branding .with-image #searchform {
+#branding .only-search.with-image #searchform {
         top: auto;
         bottom: -27px;
         max-width: 195px;
 }
-#branding .only-search + #access div {
+#branding .only-search + #access div ul {
         padding-right: 205px;
 }