From e643a5b2f3c2fc2ef0cb531c2a582f2f3d65ac6b Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Thu, 11 Dec 2025 11:27:29 -0400
Subject: [PATCH 1/5] Use more css vars in single theme css

---
 css/_single_theme.css.php | 93 +++++++++++++++++++++------------------
 1 file changed, 49 insertions(+), 44 deletions(-)

diff --git a/css/_single_theme.css.php b/css/_single_theme.css.php
index 2b0bd69981..033e55033a 100644
--- a/css/_single_theme.css.php
+++ b/css/_single_theme.css.php
@@ -20,8 +20,8 @@
 }
 
 .frm_forms.<?php echo esc_html( $style_class ); ?>{
-	max-width:<?php echo esc_html( $form_width . $important ); ?>;
-	direction:<?php echo esc_html( $direction . $important ); ?>;
+	max-width:var(--form-width)<?php echo esc_html( $important ); ?>;
+	direction:var(--direction)<?php echo esc_html( $important ); ?>;
 	<?php if ( 'rtl' === $direction ) { ?>
 	unicode-bidi:embed;
 	<?php } ?>
@@ -38,7 +38,7 @@
 
 <?php if ( ! empty( $field_margin ) ) { ?>
 .<?php echo esc_html( $style_class ); ?> .form-field{
-	margin-bottom:<?php echo esc_html( $field_margin . $important ); ?>;
+	margin-bottom:var(--field-margin)<?php echo esc_html( $important ); ?>;
 }
 <?php } ?>
 
@@ -119,7 +119,7 @@
 
 .<?php echo esc_html( $style_class ); ?> .frm_pos_right{
 	display:inline<?php echo esc_html( $important ); ?>;
-	width:<?php echo esc_html( $width . $important ); ?>;
+	width:var(--width)<?php echo esc_html( $important ); ?>;
 }
 
 .<?php echo esc_html( $style_class ); ?> .frm_none_container .frm_primary_label,
@@ -144,10 +144,9 @@
 }
 <?php endif; ?>
 
-/* These do not work if they are combined */
 .<?php echo esc_html( $style_class ); ?> input::placeholder,
 .<?php echo esc_html( $style_class ); ?> textarea::placeholder{
-	color: <?php echo esc_html( $text_color_disabled . $important ); ?>;
+	color: var(--text-color-disabled)<?php echo esc_html( $important ); ?>;
 }
 
 .<?php echo esc_html( $style_class ); ?> .frm_default,
@@ -159,7 +158,7 @@
 .<?php echo esc_html( $style_class ); ?> .chosen-container-single .chosen-default,
 <?php } ?>
 .<?php echo esc_html( $style_class ); ?> .placeholder {
-	color: <?php echo esc_html( $text_color_disabled . $important ); ?>;
+	color: var(--text-color-disabled)<?php echo esc_html( $important ); ?>;
 }
 
 .<?php echo esc_html( $style_class ); ?> .form-field input:not([type=file]):not([type=range]):not([readonly]):focus,
@@ -178,8 +177,8 @@
 .<?php echo esc_html( $style_class ); ?> .chosen-container-active .chosen-choices,
 <?php } ?>
 .<?php echo esc_html( $style_class ); ?> .frm_focus_field .frm-card-element.StripeElement {
-	background-color:<?php echo esc_html( $bg_color_active . $important ); ?>;
-	border-color:<?php echo esc_html( $border_color_active . $important ); ?>;
+	background-color:var(--bg-color-active)<?php echo esc_html( $important ); ?>;
+	border-color:var(--border-color-active)<?php echo esc_html( $important ); ?>;
 	color: var(--text-color);
 	<?php if ( isset( $remove_box_shadow_active ) && $remove_box_shadow_active ) { ?>
 	box-shadow:none;
@@ -249,9 +248,9 @@
 .<?php echo esc_html( $style_class ); ?> input[type=submit]:hover,
 .<?php echo esc_html( $style_class ); ?> .frm_submit input[type=button]:hover,
 .<?php echo esc_html( $style_class ); ?> .frm_submit button:hover{
-	background: <?php echo esc_html( $submit_hover_bg_color . $important ); ?>;
-	border-color: <?php echo esc_html( $submit_hover_border_color . $important ); ?>;
-	color: <?php echo esc_html( $submit_hover_color . $important ); ?>;
+	background: var(--submit-hover-bg-color)<?php echo esc_html( $important ); ?>;
+	border-color: var(--submit-hover-border-color)<?php echo esc_html( $important ); ?>;
+	color: var(--submit-hover-color)<?php echo esc_html( $important ); ?>;
 }
 
 .<?php echo esc_html( $style_class ); ?>.frm_center_submit .frm_submit .frm_ajax_loading{
@@ -265,9 +264,9 @@
 .<?php echo esc_html( $style_class ); ?> input[type=submit]:active,
 .<?php echo esc_html( $style_class ); ?> .frm_submit input[type=button]:active,
 .<?php echo esc_html( $style_class ); ?> .frm_submit button:active{
-	background: <?php echo esc_html( $submit_active_bg_color . $important ); ?>;
-	border-color: <?php echo esc_html( $submit_active_border_color . $important ); ?>;
-	color: <?php echo esc_html( $submit_active_color . $important ); ?>;
+	background: var(--submit-active-bg-color)<?php echo esc_html( $important ); ?>;
+	border-color: var(--submit-active-border-color)<?php echo esc_html( $important ); ?>;
+	color: var(--submit-active-color)<?php echo esc_html( $important ); ?>;
 	outline: none;
 }
 
@@ -279,20 +278,20 @@
 .<?php echo esc_html( $style_class ); ?> .frm_loading_form .frm_button_submit:hover,
 .<?php echo esc_html( $style_class ); ?> .frm_loading_form .frm_button_submit:active,
 .<?php echo esc_html( $style_class ); ?> .frm_loading_form .frm_button_submit:focus{
-	color: transparent <?php echo esc_html( $important ); ?>;
-	background: <?php echo esc_html( $submit_bg_color . $important ); ?>;
-	border-color: <?php echo esc_html( $submit_bg_color . $important ); ?>;
+	color: transparent<?php echo esc_html( $important ); ?>;
+	background: var(--submit-bg-color)<?php echo esc_html( $important ); ?>;
+	border-color: var(--submit-bg-color)<?php echo esc_html( $important ); ?>;
 }
 
 .<?php echo esc_html( $style_class ); ?> .frm_loading_prev .frm_prev_page:before,
 .<?php echo esc_html( $style_class ); ?> .frm_loading_form .frm_button_submit:before {
-	border-bottom-color: <?php echo esc_html( $submit_text_color . $important ); ?>;
-	border-right-color: <?php echo esc_html( $submit_text_color . $important ); ?>;
+	border-bottom-color: var(--submit-text-color)<?php echo esc_html( $important ); ?>;
+	border-right-color: var(--submit-text-color)<?php echo esc_html( $important ); ?>;
 		<?php if ( $submit_height !== 'auto' ) { ?>
-			max-height:<?php echo esc_html( $submit_height ); ?>;
+			max-height:var(--submit-height)<?php echo esc_html( $important ); ?>;
 		<?php } ?>
 		<?php if ( $submit_width !== 'auto' ) { ?>
-			max-width:<?php echo esc_html( $submit_width ); ?>;
+			max-width:var(--submit-width)<?php echo esc_html( $important ); ?>;
 		<?php } ?>
 }
 		<?php
@@ -306,11 +305,11 @@
 	<?php if ( ! empty( $font ) ) { ?>
 		font-family:<?php FrmAppHelper::kses_echo( $font ); ?>;
 	<?php } ?>
-	font-size:<?php echo esc_html( $font_size . $important ); ?>;
-	color:<?php echo esc_html( $label_color . $important ); ?>;
-	font-weight:<?php echo esc_html( $weight . $important ); ?>;
+	font-size:var(--font-size)<?php echo esc_html( $important ); ?>;
+	color:var(--label-color)<?php echo esc_html( $important ); ?>;
+	font-weight:var(--weight)<?php echo esc_html( $important ); ?>;
 	margin:0;
-	padding:<?php echo esc_html( $label_padding . $important ); ?>;
+	padding:var(--label-padding)<?php echo esc_html( $important ); ?>;
 	width:auto;
 	display:block;
 	visibility:hidden;
@@ -323,15 +322,18 @@
 	margin: 0 !important;
 }
 
+<?php // Only inclide this CSS when the math captcha plugin is active. ?>
+<?php if ( class_exists( 'FrmCptController' ) ) : ?>
 .<?php echo esc_html( $style_class ); ?> #frm_field_cptch_number_container{
 	<?php if ( ! empty( $font ) ) { ?>
 		font-family:<?php FrmAppHelper::kses_echo( $font ); ?>;
 	<?php } ?>
-	font-size:<?php echo esc_html( $font_size . $important ); ?>;
-	color:<?php echo esc_html( $label_color . $important ); ?>;
-	font-weight:<?php echo esc_html( $weight . $important ); ?>;
+	font-size:var(--font-size)<?php echo esc_html( $important ); ?>;
+	color:var(--label-color)<?php echo esc_html( $important ); ?>;
+	font-weight:var(--weight)<?php echo esc_html( $important ); ?>;
 	clear:both;
 }
+<?php endif; ?>
 
 .<?php echo esc_html( $style_class ); ?> .frm_blank_field input[type=text],
 .<?php echo esc_html( $style_class ); ?> .frm_blank_field input[type=password],
@@ -353,31 +355,34 @@
 .<?php echo esc_html( $style_class ); ?> .frm_blank_field .chosen-container-single .chosen-single,
 <?php } ?>
 .<?php echo esc_html( $style_class ); ?> .frm_form_field :invalid {
-	color:<?php echo esc_html( $text_color_error . $important ); ?>;
-	background-color:<?php echo esc_html( $bg_color_error . $important ); ?>;
-	border-color:<?php echo esc_html( $border_color_error . $important ); ?>;
-	border-width:var(--border-width-error) <?php echo esc_html( $important ); ?>;
-	border-style:<?php echo esc_html( $border_style_error . $important ); ?>;
+	color:var(--text-color-error)<?php echo esc_html( $important ); ?>;
+	background-color:var(--bg-color-error)<?php echo esc_html( $important ); ?>;
+	border-color:var(--border-color-error)<?php echo esc_html( $important ); ?>;
+	border-width:var(--border-width-error)<?php echo esc_html( $important ); ?>;
+	border-style:var(--border-style-error)<?php echo esc_html( $important ); ?>;
 }
 
+<?php // Only include this style when the signatures add-on is active ?>
+<?php if ( class_exists( 'FrmSigField' ) ) : ?>
 .<?php echo esc_html( $style_class ); ?> .frm_blank_field .sigWrapper{
-	border-color:<?php echo esc_html( $border_color_error ); ?> !important;
+	border-color:var(--border-color-error) !important;
 }
+<?php endif; ?>
 
 .<?php echo esc_html( $style_class ); ?> .frm_error,
 .<?php echo esc_html( $style_class ); ?> .frm_limit_error{
-	font-weight:<?php echo esc_html( $weight . $important ); ?>;
-	color:<?php echo esc_html( $border_color_error . $important ); ?>;
+	font-weight:var(--weight)<?php echo esc_html( $important ); ?>;
+	color:var(--border-color-error)<?php echo esc_html( $important ); ?>;
 }
 
 .<?php echo esc_html( $style_class ); ?> .frm_error_style{
-	background-color:<?php echo esc_html( $error_bg . $important ); ?>;
-	border:1px solid <?php echo esc_html( $error_border . $important ); ?>;
-	border-radius:<?php echo esc_html( $border_radius . $important ); ?>;
-	color: <?php echo esc_html( $error_text . $important ); ?>;
-	font-size:<?php echo esc_html( $error_font_size . $important ); ?>;
+	background-color:var(--error-bg)<?php echo esc_html( $important ); ?>;
+	border:1px solid var(--error-border)<?php echo esc_html( $important ); ?>;
+	border-radius:var(--border-radius)<?php echo esc_html( $important ); ?>;
+	color: var(--error-text)<?php echo esc_html( $important ); ?>;
+	font-size:var(--error-font-size)<?php echo esc_html( $important ); ?>;
 	margin:0;
-	margin-bottom:<?php echo esc_html( $field_margin ); ?>;
+	margin-bottom:var(--field-margin);
 }
 
 .<?php echo esc_html( $style_class ); ?> #frm_loading .progress-striped .progress-bar{
@@ -385,7 +390,7 @@
 }
 
 .<?php echo esc_html( $style_class ); ?> #frm_loading .progress-bar{
-	background-color:<?php echo esc_html( $bg_color . $important ); ?>;
+	background-color:var(--bg-color)<?php echo esc_html( $important ); ?>;
 }
 
 .<?php echo esc_html( $style_class ); ?> .frm_form_field.frm_total_big input,

From 7466c2a3014cca0d6ec4add78f1fa9d4ce5d3482 Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Thu, 11 Dec 2025 11:33:55 -0400
Subject: [PATCH 2/5] Try another syntax

---
 css/_single_theme.css.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/css/_single_theme.css.php b/css/_single_theme.css.php
index 033e55033a..23f978c771 100644
--- a/css/_single_theme.css.php
+++ b/css/_single_theme.css.php
@@ -322,8 +322,10 @@
 	margin: 0 !important;
 }
 
-<?php // Only inclide this CSS when the math captcha plugin is active. ?>
-<?php if ( class_exists( 'FrmCptController' ) ) : ?>
+<?php
+// Only include this CSS when the math captcha plugin is active.
+if ( class_exists( 'FrmCptController' ) ) :
+?>
 .<?php echo esc_html( $style_class ); ?> #frm_field_cptch_number_container{
 	<?php if ( ! empty( $font ) ) { ?>
 		font-family:<?php FrmAppHelper::kses_echo( $font ); ?>;
@@ -333,7 +335,9 @@
 	font-weight:var(--weight)<?php echo esc_html( $important ); ?>;
 	clear:both;
 }
-<?php endif; ?>
+<?php
+endif;
+?>
 
 .<?php echo esc_html( $style_class ); ?> .frm_blank_field input[type=text],
 .<?php echo esc_html( $style_class ); ?> .frm_blank_field input[type=password],
@@ -362,12 +366,16 @@
 	border-style:var(--border-style-error)<?php echo esc_html( $important ); ?>;
 }
 
-<?php // Only include this style when the signatures add-on is active ?>
-<?php if ( class_exists( 'FrmSigField' ) ) : ?>
+<?php
+// Only include this style when the signatures add-on is active
+if ( class_exists( 'FrmSigField' ) ) :
+?>
 .<?php echo esc_html( $style_class ); ?> .frm_blank_field .sigWrapper{
 	border-color:var(--border-color-error) !important;
 }
-<?php endif; ?>
+<?php
+endif;
+?>
 
 .<?php echo esc_html( $style_class ); ?> .frm_error,
 .<?php echo esc_html( $style_class ); ?> .frm_limit_error{

From e0c94259ca36bf469553dde62280f70173ab08bc Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Thu, 11 Dec 2025 11:36:08 -0400
Subject: [PATCH 3/5] Try bumping version in workflow

---
 .github/workflows/syntax.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/syntax.yml b/.github/workflows/syntax.yml
index 0d9d0d17b0..9773575ac4 100644
--- a/.github/workflows/syntax.yml
+++ b/.github/workflows/syntax.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.1
 
-      - uses: shivammathur/setup-php@2.25.5
+      - uses: shivammathur/setup-php@2.36.0
         with:
           php-version: ${{ matrix.php }}
       - name: Check PHP ${{ matrix.multisite }} syntax

From 6616d904b6e0b9994d4a9824543ffc789cdd5436 Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Thu, 11 Dec 2025 11:52:10 -0400
Subject: [PATCH 4/5] Run phpcbf

---
 css/_single_theme.css.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/css/_single_theme.css.php b/css/_single_theme.css.php
index 23f978c771..27e8e99bcb 100644
--- a/css/_single_theme.css.php
+++ b/css/_single_theme.css.php
@@ -325,7 +325,7 @@
 <?php
 // Only include this CSS when the math captcha plugin is active.
 if ( class_exists( 'FrmCptController' ) ) :
-?>
+	?>
 .<?php echo esc_html( $style_class ); ?> #frm_field_cptch_number_container{
 	<?php if ( ! empty( $font ) ) { ?>
 		font-family:<?php FrmAppHelper::kses_echo( $font ); ?>;
@@ -335,7 +335,7 @@
 	font-weight:var(--weight)<?php echo esc_html( $important ); ?>;
 	clear:both;
 }
-<?php
+	<?php
 endif;
 ?>
 
@@ -369,11 +369,11 @@
 <?php
 // Only include this style when the signatures add-on is active
 if ( class_exists( 'FrmSigField' ) ) :
-?>
+	?>
 .<?php echo esc_html( $style_class ); ?> .frm_blank_field .sigWrapper{
 	border-color:var(--border-color-error) !important;
 }
-<?php
+	<?php
 endif;
 ?>
 

From 8bbb7b33890322c20cbbea4c219c652c53b98cab Mon Sep 17 00:00:00 2001
From: Mike Letellier <mike@crabcyb.org>
Date: Thu, 11 Dec 2025 11:59:52 -0400
Subject: [PATCH 5/5] Remove some extra spaces to be more consistent

---
 css/_single_theme.css.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/css/_single_theme.css.php b/css/_single_theme.css.php
index 27e8e99bcb..885160851e 100644
--- a/css/_single_theme.css.php
+++ b/css/_single_theme.css.php
@@ -146,7 +146,7 @@
 
 .<?php echo esc_html( $style_class ); ?> input::placeholder,
 .<?php echo esc_html( $style_class ); ?> textarea::placeholder{
-	color: var(--text-color-disabled)<?php echo esc_html( $important ); ?>;
+	color:var(--text-color-disabled)<?php echo esc_html( $important ); ?>;
 }
 
 .<?php echo esc_html( $style_class ); ?> .frm_default,
@@ -158,7 +158,7 @@
 .<?php echo esc_html( $style_class ); ?> .chosen-container-single .chosen-default,
 <?php } ?>
 .<?php echo esc_html( $style_class ); ?> .placeholder {
-	color: var(--text-color-disabled)<?php echo esc_html( $important ); ?>;
+	color:var(--text-color-disabled)<?php echo esc_html( $important ); ?>;
 }
 
 .<?php echo esc_html( $style_class ); ?> .form-field input:not([type=file]):not([type=range]):not([readonly]):focus,
@@ -179,7 +179,7 @@
 .<?php echo esc_html( $style_class ); ?> .frm_focus_field .frm-card-element.StripeElement {
 	background-color:var(--bg-color-active)<?php echo esc_html( $important ); ?>;
 	border-color:var(--border-color-active)<?php echo esc_html( $important ); ?>;
-	color: var(--text-color);
+	color:var(--text-color);
 	<?php if ( isset( $remove_box_shadow_active ) && $remove_box_shadow_active ) { ?>
 	box-shadow:none;
 	outline: none;
@@ -248,9 +248,9 @@
 .<?php echo esc_html( $style_class ); ?> input[type=submit]:hover,
 .<?php echo esc_html( $style_class ); ?> .frm_submit input[type=button]:hover,
 .<?php echo esc_html( $style_class ); ?> .frm_submit button:hover{
-	background: var(--submit-hover-bg-color)<?php echo esc_html( $important ); ?>;
-	border-color: var(--submit-hover-border-color)<?php echo esc_html( $important ); ?>;
-	color: var(--submit-hover-color)<?php echo esc_html( $important ); ?>;
+	background:var(--submit-hover-bg-color)<?php echo esc_html( $important ); ?>;
+	border-color:var(--submit-hover-border-color)<?php echo esc_html( $important ); ?>;
+	color:var(--submit-hover-color)<?php echo esc_html( $important ); ?>;
 }
 
 .<?php echo esc_html( $style_class ); ?>.frm_center_submit .frm_submit .frm_ajax_loading{
@@ -264,9 +264,9 @@
 .<?php echo esc_html( $style_class ); ?> input[type=submit]:active,
 .<?php echo esc_html( $style_class ); ?> .frm_submit input[type=button]:active,
 .<?php echo esc_html( $style_class ); ?> .frm_submit button:active{
-	background: var(--submit-active-bg-color)<?php echo esc_html( $important ); ?>;
-	border-color: var(--submit-active-border-color)<?php echo esc_html( $important ); ?>;
-	color: var(--submit-active-color)<?php echo esc_html( $important ); ?>;
+	background:var(--submit-active-bg-color)<?php echo esc_html( $important ); ?>;
+	border-color:var(--submit-active-border-color)<?php echo esc_html( $important ); ?>;
+	color:var(--submit-active-color)<?php echo esc_html( $important ); ?>;
 	outline: none;
 }
 
@@ -279,14 +279,14 @@
 .<?php echo esc_html( $style_class ); ?> .frm_loading_form .frm_button_submit:active,
 .<?php echo esc_html( $style_class ); ?> .frm_loading_form .frm_button_submit:focus{
 	color: transparent<?php echo esc_html( $important ); ?>;
-	background: var(--submit-bg-color)<?php echo esc_html( $important ); ?>;
-	border-color: var(--submit-bg-color)<?php echo esc_html( $important ); ?>;
+	background:var(--submit-bg-color)<?php echo esc_html( $important ); ?>;
+	border-color:var(--submit-bg-color)<?php echo esc_html( $important ); ?>;
 }
 
 .<?php echo esc_html( $style_class ); ?> .frm_loading_prev .frm_prev_page:before,
 .<?php echo esc_html( $style_class ); ?> .frm_loading_form .frm_button_submit:before {
-	border-bottom-color: var(--submit-text-color)<?php echo esc_html( $important ); ?>;
-	border-right-color: var(--submit-text-color)<?php echo esc_html( $important ); ?>;
+	border-bottom-color:var(--submit-text-color)<?php echo esc_html( $important ); ?>;
+	border-right-color:var(--submit-text-color)<?php echo esc_html( $important ); ?>;
 		<?php if ( $submit_height !== 'auto' ) { ?>
 			max-height:var(--submit-height)<?php echo esc_html( $important ); ?>;
 		<?php } ?>
@@ -387,7 +387,7 @@
 	background-color:var(--error-bg)<?php echo esc_html( $important ); ?>;
 	border:1px solid var(--error-border)<?php echo esc_html( $important ); ?>;
 	border-radius:var(--border-radius)<?php echo esc_html( $important ); ?>;
-	color: var(--error-text)<?php echo esc_html( $important ); ?>;
+	color:var(--error-text)<?php echo esc_html( $important ); ?>;
 	font-size:var(--error-font-size)<?php echo esc_html( $important ); ?>;
 	margin:0;
 	margin-bottom:var(--field-margin);