From 3d1db8d8223aab7e7d19d8f2173163d75d80530a Mon Sep 17 00:00:00 2001
From: CarliPinell <carlos.pinell@processmaker.com>
Date: Tue, 22 Oct 2024 12:31:55 -0400
Subject: [PATCH] Adding code someone removes in conflicts

---
 src/form-builder-controls.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/form-builder-controls.js b/src/form-builder-controls.js
index 88badebe9..b9c6fb2d4 100755
--- a/src/form-builder-controls.js
+++ b/src/form-builder-controls.js
@@ -46,7 +46,9 @@ import {
   tooltipProperty,
   LoadingSubmitButtonProperty,
   LabelSubmitButtonProperty,
-  bgcolorModern
+  bgcolorModern,
+  bgcolorPropertyRecord,
+  colorPropertyRecord,
 } from './form-control-common-properties';
 
 export default [
@@ -566,8 +568,8 @@ export default [
             helper: ''
           }
         },
-        colorProperty,
-        bgcolorProperty,
+        colorPropertyRecord,
+        bgcolorPropertyRecord,
         bgcolorModern
       ],
     },