Changeset 30221

Timestamp:

11/03/2014 09:58:56 PM (10 years ago)

Author:

iandstewart

Message:

Twenty Fifteen: check if user-selected custom colors are the same as default so we're not duplicating styles.

Props iamtakashi, fixes #30234

File:

• trunk/src/wp-content/themes/twentyfifteen/inc/custom-header.php (modified) (2 diffs)

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

@@ -168 +168 @@
  */
 function twentyfifteen_header_background_color_css() {
+    $color_scheme            = twentyfifteen_get_color_scheme();
+    $default_color           = $color_scheme[1];
     $header_background_color = get_theme_mod( 'header_background_color', '#ffffff' );
 
     // Don't do anything if the current color is the default.
-    if ( '#ffffff' === $header_background_color ) {
+    if ( $header_background_color === $default_color ) {
         return;
     }
@@ -210 +212 @@
  */
 function twentyfifteen_sidebar_text_color_css() {
+    $color_scheme       = twentyfifteen_get_color_scheme();
+    $default_color      = $color_scheme[4];
     $sidebar_link_color = get_theme_mod( 'sidebar_textcolor', '#333333' );
 
     // Don't do anything if the current color is the default.
-    if ( '#333333' === $sidebar_link_color ) {
+    if ( $sidebar_link_color === $default_color ) {
         return;
     }