From 90c709f158183f2322146ac0a8a464759c00ef28 Mon Sep 17 00:00:00 2001
From: Wroud <wrouds@gmail.com>
Date: Thu, 15 Oct 2020 00:59:34 +0300
Subject: [PATCH] fix(core-blocks): CB-338 checkbox styles

---
 .../src/FormControls/Checkboxes/FieldCheckbox.tsx         | 5 ++---
 .../Connections/ConnectionForm/Options/Options.tsx        | 1 +
 .../Connections/ConnectionForm/Options/ParametersForm.tsx | 8 +-------
 .../Connections/ConnectionForm/Options/formStyles.ts      | 2 +-
 .../Connections/CreateConnection/CreateConnection.tsx     | 2 +-
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx b/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx
index de18d270f7..b46362578d 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx
@@ -14,9 +14,8 @@ import { baseFormControlStyles } from '../baseFormControlStyles';
 import { Checkbox, CheckboxType, CheckboxControlledProps, CheckboxObjectProps } from './Checkbox';
 
 const fieldCheckboxStyles = css`
-  field {
-    margin-left: -10px;
-    margin-right: -10px;
+  Checkbox {
+    margin: -10px;
   }
 `;
 
diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/Options.tsx b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/Options.tsx
index f2544b88f8..0657cce765 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/Options.tsx
+++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/Options.tsx
@@ -49,6 +49,7 @@ const styles = css`
   }
   TabPanel {
     flex-direction: column;
+    max-width: 630px;
   }
 `;
 
diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/ParametersForm.tsx b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/ParametersForm.tsx
index 0e13b92412..19dd37791c 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/ParametersForm.tsx
+++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/ParametersForm.tsx
@@ -22,12 +22,6 @@ interface ParametersFormProps {
   embedded?: boolean;
 }
 
-const styles = css`
-  layout-grid-inner {
-    max-width: 630px;
-  }
-`;
-
 export const ParametersForm = observer(function ParametersForm({
   connection,
   embedded,
@@ -35,7 +29,7 @@ export const ParametersForm = observer(function ParametersForm({
 }: ParametersFormProps) {
   const translate = useTranslate();
 
-  return styled(useStyles(formStyles, styles))(
+  return styled(useStyles(formStyles))(
     <>
       {!embedded && (
         <layout-grid-inner as="div">
diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/formStyles.ts b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/formStyles.ts
index 1d493cba58..3128565886 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/formStyles.ts
+++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/formStyles.ts
@@ -19,7 +19,7 @@ export const formStyles = css`
     flex: 1;
   }
   connection-type {
-    margin-left: 150px;
+    margin-left: 180px;
   }
   Radio {
     composes: theme-typography--body1 from global;
diff --git a/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/CreateConnection.tsx b/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/CreateConnection.tsx
index d77b1b5b4b..e414bd1d20 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/CreateConnection.tsx
+++ b/webapp/packages/core-connections/src/Administration/Connections/CreateConnection/CreateConnection.tsx
@@ -52,7 +52,7 @@ const styles = composes(
     connection-create {
       display: flex;
       flex-direction: column;
-      height: 570px;
+      height: 540px;
       overflow: hidden;
     }