Browse Source

Change CSS variable assignment order

First Seedlet was changed so that all custom CSS variables for color
definitions are associated with the 'seedlet-custom-color-overrides'
stylesheed.  (Previously only editor override styles were associated
with that stylesheet.

Next Spearhead was changed to first dequeue that stylesheet, THEN assign
the spearhead-specific style variables THEN re-enqueue that
seedlet-custom-color-overrides stylesheet.

This puts the customizer color variable assignments AFTER the Spearhead
variable assignments so that those are the values that are used.
Jason Crist 4 years ago
parent
commit
fba2523485
2 changed files with 4 additions and 1 deletions
  1. 2 1
      seedlet/classes/class-seedlet-custom-colors.php
  2. 2 0
      spearhead/functions.php

+ 2 - 1
seedlet/classes/class-seedlet-custom-colors.php

@@ -262,8 +262,9 @@ class Seedlet_Custom_Colors {
 	 * Customizer & frontend custom color variables.
 	 * Customizer & frontend custom color variables.
 	 */
 	 */
 	function seedlet_custom_color_variables() {
 	function seedlet_custom_color_variables() {
+		wp_enqueue_style( 'seedlet-custom-color-overrides', get_template_directory_uri() . '/assets/css/custom-color-overrides.css', array(), wp_get_theme()->get( 'Version' ) );
 		if ( 'default' !== get_theme_mod( 'custom_colors_active' ) ) {
 		if ( 'default' !== get_theme_mod( 'custom_colors_active' ) ) {
-			wp_add_inline_style( 'seedlet-style', $this->seedlet_generate_custom_color_variables() );
+			wp_add_inline_style( 'seedlet-custom-color-overrides', $this->seedlet_generate_custom_color_variables() );
 		}
 		}
 	}
 	}
 
 

+ 2 - 0
spearhead/functions.php

@@ -120,7 +120,9 @@ function spearhead_scripts() {
 	wp_enqueue_style( 'spearhead-fonts', spearhead_fonts_url(), array(), null );
 	wp_enqueue_style( 'spearhead-fonts', spearhead_fonts_url(), array(), null );
 
 
 	// Child theme variables
 	// Child theme variables
+	wp_dequeue_style( 'seedlet-custom-color-overrides' );
 	wp_enqueue_style( 'spearhead-variables-style', get_stylesheet_directory_uri() . '/variables.css', array(), wp_get_theme()->get( 'Version' ) );
 	wp_enqueue_style( 'spearhead-variables-style', get_stylesheet_directory_uri() . '/variables.css', array(), wp_get_theme()->get( 'Version' ) );
+	wp_enqueue_style( 'seedlet-custom-color-overrides' );
 
 
 	// enqueue child styles
 	// enqueue child styles
 	wp_enqueue_style( 'spearhead-style', get_stylesheet_uri(), array(), wp_get_theme()->get( 'Version' ) );
 	wp_enqueue_style( 'spearhead-style', get_stylesheet_uri(), array(), wp_get_theme()->get( 'Version' ) );