Changeset 26668

Timestamp:

12/05/2013 05:29:10 PM (11 years ago)

Author:

lancewillett

Message:

Twenty Fourteen: better logic for hide/show title and description, and Customizer handling of the same. Add ID attributes to style blocks. Fixes #26338.

Location:

trunk/src/wp-content/themes/twentyfourteen

Files:

• inc/custom-header.php (modified) (2 diffs)
• js/customizer.js (modified) (1 diff)

trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php

@@ -56 +56 @@
  */
 function twentyfourteen_header_style() {
-    $header_text_color = get_header_textcolor();
+    $text_color = get_header_textcolor();
 
-    // If no custom options for text are set, let's bail
-    // $header_text_color options: HEADER_TEXTCOLOR is default, hide text (returns 'blank') or any hex value
-    if ( HEADER_TEXTCOLOR == $header_text_color )
+    // If no custom color for text is set, let's bail.
+    if ( display_header_text() && $text_color === get_theme_support( 'custom-header', 'default-text-color' ) )
         return;
-    // If we get this far, we have custom styles. Let's do this.
+
+    // If we get this far, we have custom styles.
     ?>
-    <style type="text/css">
+    <style type="text/css" id="twentyfourteen-header-css">
     <?php
         // Has the text been hidden?
-        if ( 'blank' == $header_text_color ) :
+        if ( ! display_header_text() ) :
     ?>
-        .site-title {
-            position: absolute !important;
-            clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
+        .site-title,
+        .site-description {
+            position: absolute;
+            clip: rect(1px 1px 1px 1px); /* IE7 */
             clip: rect(1px, 1px, 1px, 1px);
         }
     <?php
-        // If the user has set a custom color for the text use that
-        else :
+        // 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 {
-            color: #<?php echo $header_text_color; ?>;
+            color: #<?php echo esc_attr( $text_color ); ?>;
         }
     <?php endif; ?>
@@ -98 +99 @@
 function twentyfourteen_admin_header_style() {
 ?>
-    <style type="text/css">
+    <style type="text/css" id="twentyfourteen-admin-header-css">
     .appearance_page_custom-header #headimg {
         background-color: #000;

trunk/src/wp-content/themes/twentyfourteen/js/customizer.js

@@ -20 +20 @@
         value.bind( function( to ) {
             if ( 'blank' === to ) {
-                $( '.site-title a, .site-description' ).css( {
+                $( '.site-title, .site-description' ).css( {
                     'clip': 'rect(1px, 1px, 1px, 1px)',
                     'position': 'absolute'
                 } );
             } else {
-                $( '.site-title a,  .site-description' ).css( {
+                $( '.site-title,  .site-description' ).css( {
                     'clip': 'auto',
-                    'position': 'relative'
+                    'position': 'static'
                 } );