From 0949cbd35682c4d019025cd7350c31d362520315 Mon Sep 17 00:00:00 2001
From: MeenamAfzal <meenamafzal1@gmail.com>
Date: Fri, 7 Jun 2024 16:12:21 +0500
Subject: [PATCH 1/3] background color updated

---
 client/packages/lowcoder/src/comps/comps/qrCodeComp.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/packages/lowcoder/src/comps/comps/qrCodeComp.tsx b/client/packages/lowcoder/src/comps/comps/qrCodeComp.tsx
index 818c5267f..0c4341c2a 100644
--- a/client/packages/lowcoder/src/comps/comps/qrCodeComp.tsx
+++ b/client/packages/lowcoder/src/comps/comps/qrCodeComp.tsx
@@ -31,7 +31,7 @@ const childrenMap = {
   level: dropdownControl(levelOptions, 'L'),
   includeMargin: BoolControl.DEFAULT_TRUE,
   image: StringControl,
-  style: styleControl(QRCodeStyle),
+  style: withDefault(styleControl(QRCodeStyle),{background:'transparent'}),
   animationStyle: styleControl(AnimationStyle),
   restrictPaddingOnRotation: withDefault(StringControl, 'qrCode'),
 };

From 4e1d247b814d3fa8b762ada2b98df11d137b332d Mon Sep 17 00:00:00 2001
From: MeenamAfzal <meenamafzal1@gmail.com>
Date: Sat, 8 Jun 2024 01:37:41 +0500
Subject: [PATCH 2/3] width adjusted

---
 client/packages/lowcoder-design/src/components/control.tsx   | 2 +-
 client/packages/lowcoder/src/comps/controls/colorControl.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/packages/lowcoder-design/src/components/control.tsx b/client/packages/lowcoder-design/src/components/control.tsx
index e8f1f4ca1..b855f8838 100644
--- a/client/packages/lowcoder-design/src/components/control.tsx
+++ b/client/packages/lowcoder-design/src/components/control.tsx
@@ -164,7 +164,7 @@ export const ControlPropertyViewWrapper = (
         </LabelWrapper>
       )}
       {preInputNode}
-      <ChildrenWrapper style={childrenWrapperStyle} $layout={layout}>
+      <ChildrenWrapper style={{...childrenWrapperStyle,marginLeft:label==='Margin'||label==='Padding'?'6px':'0px'}} $layout={layout}>
         {children}
         {extraChildren}
       </ChildrenWrapper>
diff --git a/client/packages/lowcoder/src/comps/controls/colorControl.tsx b/client/packages/lowcoder/src/comps/controls/colorControl.tsx
index 0c00f9e75..7eb7a24d9 100644
--- a/client/packages/lowcoder/src/comps/controls/colorControl.tsx
+++ b/client/packages/lowcoder/src/comps/controls/colorControl.tsx
@@ -27,7 +27,7 @@ const DepIcon = styled(IconDep)`
 const ColorInput = styled.div`
   //position: absolute;
   outline: none;
-  width: 140px;
+  width: 135px;
   min-height: 30px;
 `;
 

From 1d0bf361cc129a3d16d835de41cce998a23a8dbe Mon Sep 17 00:00:00 2001
From: MeenamAfzal <meenamafzal1@gmail.com>
Date: Sat, 8 Jun 2024 02:00:46 +0500
Subject: [PATCH 3/3] comment added

---
 client/packages/lowcoder-design/src/components/control.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/packages/lowcoder-design/src/components/control.tsx b/client/packages/lowcoder-design/src/components/control.tsx
index b855f8838..233b4d657 100644
--- a/client/packages/lowcoder-design/src/components/control.tsx
+++ b/client/packages/lowcoder-design/src/components/control.tsx
@@ -164,7 +164,7 @@ export const ControlPropertyViewWrapper = (
         </LabelWrapper>
       )}
       {preInputNode}
-      <ChildrenWrapper style={{...childrenWrapperStyle,marginLeft:label==='Margin'||label==='Padding'?'6px':'0px'}} $layout={layout}>
+      <ChildrenWrapper style={{...childrenWrapperStyle,marginLeft:label==='Margin'||label==='Padding'?'6px':'0px'}} $layout={layout}> //margin and padding are calculated differently so they're made equal
         {children}
         {extraChildren}
       </ChildrenWrapper>