WordPress.org

Make WordPress Core

Changeset 26668


Ignore:
Timestamp:
12/05/13 17:29:10 (4 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php

    r26619 r26668  
    5656 */ 
    5757function twentyfourteen_header_style() { 
    58     $header_text_color = get_header_textcolor(); 
     58    $text_color = get_header_textcolor(); 
    5959 
    60     // If no custom options for text are set, let's bail 
    61     // $header_text_color options: HEADER_TEXTCOLOR is default, hide text (returns 'blank') or any hex value 
    62     if ( HEADER_TEXTCOLOR == $header_text_color ) 
     60    // If no custom color for text is set, let's bail. 
     61    if ( display_header_text() && $text_color === get_theme_support( 'custom-header', 'default-text-color' ) ) 
    6362        return; 
    64     // If we get this far, we have custom styles. Let's do this. 
     63 
     64    // If we get this far, we have custom styles. 
    6565    ?> 
    66     <style type="text/css"> 
     66    <style type="text/css" id="twentyfourteen-header-css"> 
    6767    <?php 
    6868        // Has the text been hidden? 
    69         if ( 'blank' == $header_text_color ) : 
     69        if ( ! display_header_text() ) : 
    7070    ?> 
    71         .site-title { 
    72             position: absolute !important; 
    73             clip: rect(1px 1px 1px 1px); /* IE6, IE7 */ 
     71        .site-title, 
     72        .site-description { 
     73            position: absolute; 
     74            clip: rect(1px 1px 1px 1px); /* IE7 */ 
    7475            clip: rect(1px, 1px, 1px, 1px); 
    7576        } 
    7677    <?php 
    77         // If the user has set a custom color for the text use that 
    78         else : 
     78        // If the user has set a custom color for the text, use that. 
     79        elseif ( $text_color != get_theme_support( 'custom-header', 'default-text-color' ) ) : 
    7980    ?> 
    8081        .site-title a { 
    81             color: #<?php echo $header_text_color; ?>; 
     82            color: #<?php echo esc_attr( $text_color ); ?>; 
    8283        } 
    8384    <?php endif; ?> 
     
    9899function twentyfourteen_admin_header_style() { 
    99100?> 
    100     <style type="text/css"> 
     101    <style type="text/css" id="twentyfourteen-admin-header-css"> 
    101102    .appearance_page_custom-header #headimg { 
    102103        background-color: #000; 
  • trunk/src/wp-content/themes/twentyfourteen/js/customizer.js

    r26591 r26668  
    2020        value.bind( function( to ) { 
    2121            if ( 'blank' === to ) { 
    22                 $( '.site-title a, .site-description' ).css( { 
     22                $( '.site-title, .site-description' ).css( { 
    2323                    'clip': 'rect(1px, 1px, 1px, 1px)', 
    2424                    'position': 'absolute' 
    2525                } ); 
    2626            } else { 
    27                 $( '.site-title a,  .site-description' ).css( { 
     27                $( '.site-title,  .site-description' ).css( { 
    2828                    'clip': 'auto', 
    29                     'position': 'relative' 
     29                    'position': 'static' 
    3030                } ); 
    3131 
Note: See TracChangeset for help on using the changeset viewer.