From 404ba31e01f7494023a4c5926f3fbea44e6f037c Mon Sep 17 00:00:00 2001
From: Champ Camba <heychampsupertramp@gmail.com>
Date: Wed, 8 Mar 2017 18:38:16 +0800
Subject: [PATCH] Fix color of radio and checbox disabled fields on active
 state

---
 assets/dynamic_css/dynamic_global.php | 4 ++--
 core/um-fields.php                    | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/assets/dynamic_css/dynamic_global.php b/assets/dynamic_css/dynamic_global.php
index ae59474f..1a3561fe 100644
--- a/assets/dynamic_css/dynamic_global.php
+++ b/assets/dynamic_css/dynamic_global.php
@@ -11,8 +11,8 @@ if ( $active_color ) {
 print "
 
 .um-$form_id.um .um-tip:hover,
-.um-$form_id.um .um-field-radio.active i,
-.um-$form_id.um .um-field-checkbox.active i,
+.um-$form_id.um .um-field-radio.active:not(.um-field-radio-state-disabled) i,
+.um-$form_id.um .um-field-checkbox.active:not(.um-field-radio-state-disabled) i,
 .um-$form_id.um .um-member-name a:hover,
 .um-$form_id.um .um-member-more a:hover,
 .um-$form_id.um .um-member-less a:hover,
diff --git a/core/um-fields.php b/core/um-fields.php
index 34e5458d..9b2f8e17 100644
--- a/core/um-fields.php
+++ b/core/um-fields.php
@@ -2101,6 +2101,10 @@ class UM_Fields {
 								$class = "um-icon-android-radio-button-off";
 							}
 
+							if( ! empty( $disabled ) ){
+								$col_class .= " um-field-radio-state-disabled";
+							}
+
 							$output .= '<label class="um-field-radio '.$active.' um-field-half '.$col_class.'">';
 
 							$option_value = apply_filters('um_field_non_utf8_value',$option_value );
@@ -2179,6 +2183,10 @@ class UM_Fields {
 								$class = "um-icon-android-checkbox-outline-blank";
 							}
 
+							if( ! empty( $disabled ) ){
+								$col_class .= " um-field-radio-state-disabled";
+							}
+
 							$output .= '<label class="um-field-checkbox '.$active.' um-field-half '.$col_class.'">';
                             
                             $um_field_checkbox_item_title = $v;