From 5630e7a1fdb2459466b8f87aa260b669390906a2 Mon Sep 17 00:00:00 2001
From: MenamAfzal <meenamafzal1@gmail.com>
Date: Wed, 15 May 2024 02:36:26 +0500
Subject: [PATCH 1/2] switch component styling adjusted

---
 .../lowcoder/src/comps/controls/styleControlConstants.tsx     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx b/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx
index 177400446..2db0b504f 100644
--- a/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx
+++ b/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx
@@ -285,7 +285,7 @@ const STATIC_TEXT = {
 const LABEL = {
   name: "label",
   label: trans("label"),
-  depTheme: "canvas",
+  depTheme: "primarySurface",
   depType: DEP_TYPE.CONTRAST_TEXT,
   transformer: contrastText,
 } as const;
@@ -898,7 +898,7 @@ export const LabelStyle = [
 ]
 
 export const InputFieldStyle = [
-  getStaticBackground(SURFACE_COLOR),
+  getBackground(),
   ...STYLING_FIELDS_CONTAINER_SEQUENCE,
 ] as const;
 

From 661d088ff057442345290eb23e00180d15881070 Mon Sep 17 00:00:00 2001
From: MenamAfzal <meenamafzal1@gmail.com>
Date: Wed, 15 May 2024 03:23:04 +0500
Subject: [PATCH 2/2] other component styling adjusted

---
 .../src/comps/controls/styleControlConstants.tsx    | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx b/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx
index 2db0b504f..ba84dc694 100644
--- a/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx
+++ b/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx
@@ -277,7 +277,7 @@ const TEXT = {
 const STATIC_TEXT = {
   name: "staticText",
   label: trans("style.staticText"),
-  depTheme: "canvas",
+  depTheme: "primarySurface",
   depType: DEP_TYPE.CONTRAST_TEXT,
   transformer: contrastText,
 } as const;
@@ -562,7 +562,7 @@ function replaceAndMergeMultipleStyles(originalArray: any[], styleToReplace: str
 }
 
 export const ButtonStyle = [
-  getBackground('primary'),
+  getBackground(),
   ...STYLING_FIELDS_SEQUENCE
 ] as const;
 
@@ -1285,14 +1285,7 @@ function handleToHoverLink(color: string) {
 }
 
 export const LinkStyle = [
-
-  {
-    name: "background",
-    label: trans("style.background"),
-    depTheme: "canvas",
-    depType: DEP_TYPE.SELF,
-    transformer: toSelf,
-  },
+  getBackground(),
   ...replaceAndMergeMultipleStyles(STYLING_FIELDS_SEQUENCE, 'text', [...LinkTextStyle])
 ] as const;