Ticket #25580: 25580.diff

wp-content/themes/twentyfourteen/inc/customizer.php

@@ -20 +20 @@
 
         $wp_customize->add_setting( 'accent_color', array(
                 'default'           => '#24890d',
-                'sanitize_callback' => 'twentyfourteen_generate_accent_colors',
+                'sanitize_callback' => 'sanitize_hex_color',
         ) );
 
         $wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'accent_color', array(
@@ -28 +28 @@
                 'section'  => 'colors',
                 'settings' => 'accent_color',
         ) ) );
+
+        add_filter( 'theme_mod_accent_hover',  'twentyfourteen_accent_hover'  );
+        add_filter( 'theme_mod_accent_active', 'twentyfourteen_accent_active' );
 }
 add_action( 'customize_register', 'twentyfourteen_customize_register' );
 
@@ -42 +45 @@
 add_action( 'customize_preview_init', 'twentyfourteen_customize_preview_js' );
 
 /**
- * Generate two variants of the accent color, return the original, and
- * save the others as theme mods.
- *
- * @since Twenty Fourteen 1.0
- *
- * @param string $color The original color.
- * @return string $color The original color, sanitized.
- */
-function twentyfourteen_generate_accent_colors( $color ) {
-        $color = sanitize_hex_color( $color );
-
-        set_theme_mod( 'accent_lighter', twentyfourteen_adjust_color( $color, 14 ) );
-        set_theme_mod( 'accent_much_lighter', twentyfourteen_adjust_color( $color, 71 ) );
-
-        return $color;
-}
-
-/**
  * Tweak the brightness of a color by adjusting the RGB values by the given interval.
  *
  * Use positive values of $steps to brighten the color and negative values to darken the color.
@@ -96 +81 @@
 }
 
 /**
+ * Returns a slightly lighter color than what is set as the theme's
+ * accent color.
+ *
+ * @since Twenty Fourteen 1.0
+ *
+ * @return string
+ */
+function twentyfourteen_accent_hover() {
+        return twentyfourteen_adjust_color( get_theme_mod( 'accent_color' ), 14 );
+}
+
+/**
+ * Returns a lighter color than what is set as the theme's accent color.
+ *
+ * @since Twenty Fourteen 1.0
+ *
+ * @return string
+ */
+function twentyfourteen_accent_active() {
+        return twentyfourteen_adjust_color( get_theme_mod( 'accent_color' ), 71 );
+}
+
+/**
+ * Caches the secondary colors for the theme's accent color.
+ *
+ * @since Twenty Fourteen 1.0
+ *
+ * @return void
+ */
+function twentyfourteen_rebuild_accent_colors() {
+        set_theme_mod( 'accent_hover',  twentyfourteen_accent_hover()  );
+        set_theme_mod( 'accent_active', twentyfourteen_accent_active() );
+}
+add_action( 'update_option_theme_mods_twentyfourteen', 'twentyfourteen_rebuild_accent_colors' );
+
+/**
  * Output the CSS for the Theme Customizer options.
  *
  * @since Twenty Fourteen 1.0
@@ -103 +124 @@
  * @return void
  */
 function twentyfourteen_customizer_styles() {
-        $accent_color = get_theme_mod( 'accent_color' );
+        $accent_color = get_theme_mod( 'accent_color', '#24890d' );
 
         // Don't do anything if the current color is the default.
         if ( '#24890d' === $accent_color )
                 return;
 
-        $accent_lighter = get_theme_mod( 'accent_lighter' );
-        $accent_much_lighter = get_theme_mod( 'accent_much_lighter' );
+        $accent_hover  = get_theme_mod( 'accent_hover'  );
+        $accent_active = get_theme_mod( 'accent_active' );
 
         $css = '<style type="text/css" id="twentyfourteen-accent-color">
                 /* Custom accent color. */
@@ -175 +196 @@
                 input[type="reset"]:focus,
                 input[type="submit"]:focus,
                 .widget_calendar tbody a:hover {
-                        background-color: ' . $accent_lighter . ';
+                        background-color: ' . $accent_hover . ';
                 }
 
                 /* Generated variant of custom accent color: much lighter. */
@@ -183 +204 @@
                 html input[type="button"]:active,
                 input[type="reset"]:active,
                 input[type="submit"]:active {
-                        background-color: ' . $accent_much_lighter . ';
+                        background-color: ' . $accent_active . ';
                 }
 
                 a:hover,
@@ -196 +217 @@
                 #secondary .current-menu-item > a,
                 .featured-content a:hover,
                 .featured-content .more-link,
-                .widget-area a:hover {
-                        color: ' . $accent_much_lighter . ';
+                .widget-area a:hover,
+                .content-sidebar .widget_twentyfourteen_ephemera .post-format-archive-link:hover {
+                        color: ' . $accent_active . ';
                 }
                 </style>';