From 74bd34c4b31c5d41bd06f8ca2c055a8b649aa67a Mon Sep 17 00:00:00 2001
From: Tom Usborne <tom@edge22.com>
Date: Tue, 24 Oct 2023 12:02:21 -0600
Subject: [PATCH] Fix: Heading text color in the editor

---
 inc/block-editor.php | 48 ++++++--------------------------------------
 1 file changed, 6 insertions(+), 42 deletions(-)

diff --git a/inc/block-editor.php b/inc/block-editor.php
index d3c28514..6982127e 100644
--- a/inc/block-editor.php
+++ b/inc/block-editor.php
@@ -363,13 +363,7 @@ function generate_do_inline_block_editor_css( $for = 'block-content' ) {
 		$css->add_property( 'margin-top', '0' );
 	}
 
-	if ( $color_settings['h1_color'] ) {
-		$css->add_property( 'color', $color_settings['h1_color'] );
-	} elseif ( $color_settings['content_text_color'] ) {
-		$css->add_property( 'color', $color_settings['content_text_color'] );
-	} else {
-		$css->add_property( 'color', generate_get_option( 'text_color' ) );
-	}
+	$css->add_property( 'color', $color_settings['h1_color'] );
 
 	if ( $color_settings['content_title_color'] ) {
 		$css->set_selector( '.edit-post-visual-editor__post-title-wrapper h1' );
@@ -388,13 +382,7 @@ function generate_do_inline_block_editor_css( $for = 'block-content' ) {
 		$css->add_property( 'margin-top', '0' );
 	}
 
-	if ( $color_settings['h2_color'] ) {
-		$css->add_property( 'color', $color_settings['h2_color'] );
-	} elseif ( $color_settings['content_text_color'] ) {
-		$css->add_property( 'color', $color_settings['content_text_color'] );
-	} else {
-		$css->add_property( 'color', generate_get_option( 'text_color' ) );
-	}
+	$css->add_property( 'color', $color_settings['h2_color'] );
 
 	$css->set_selector( 'h3' );
 
@@ -408,13 +396,7 @@ function generate_do_inline_block_editor_css( $for = 'block-content' ) {
 		$css->add_property( 'margin-top', '0' );
 	}
 
-	if ( $color_settings['h3_color'] ) {
-		$css->add_property( 'color', $color_settings['h3_color'] );
-	} elseif ( $color_settings['content_text_color'] ) {
-		$css->add_property( 'color', $color_settings['content_text_color'] );
-	} else {
-		$css->add_property( 'color', generate_get_option( 'text_color' ) );
-	}
+	$css->add_property( 'color', $color_settings['h3_color'] );
 
 	$css->set_selector( 'h4' );
 
@@ -436,13 +418,7 @@ function generate_do_inline_block_editor_css( $for = 'block-content' ) {
 		}
 	}
 
-	if ( $color_settings['h4_color'] ) {
-		$css->add_property( 'color', $color_settings['h4_color'] );
-	} elseif ( $color_settings['content_text_color'] ) {
-		$css->add_property( 'color', $color_settings['content_text_color'] );
-	} else {
-		$css->add_property( 'color', generate_get_option( 'text_color' ) );
-	}
+	$css->add_property( 'color', $color_settings['h4_color'] );
 
 	$css->set_selector( 'h5' );
 
@@ -464,13 +440,7 @@ function generate_do_inline_block_editor_css( $for = 'block-content' ) {
 		}
 	}
 
-	if ( $color_settings['h5_color'] ) {
-		$css->add_property( 'color', $color_settings['h5_color'] );
-	} elseif ( $color_settings['content_text_color'] ) {
-		$css->add_property( 'color', $color_settings['content_text_color'] );
-	} else {
-		$css->add_property( 'color', generate_get_option( 'text_color' ) );
-	}
+	$css->add_property( 'color', $color_settings['h5_color'] );
 
 	$css->set_selector( 'h6' );
 
@@ -492,13 +462,7 @@ function generate_do_inline_block_editor_css( $for = 'block-content' ) {
 		}
 	}
 
-	if ( $color_settings['h6_color'] ) {
-		$css->add_property( 'color', $color_settings['h6_color'] );
-	} elseif ( $color_settings['content_text_color'] ) {
-		$css->add_property( 'color', $color_settings['content_text_color'] );
-	} else {
-		$css->add_property( 'color', generate_get_option( 'text_color' ) );
-	}
+	$css->add_property( 'color', $color_settings['h6_color'] );
 
 	$css->set_selector( 'a.button, .block-editor-block-list__layout .wp-block-button .wp-block-button__link' );