From 1be788c96039e3c9dca57f5fb0d66ecad2ea34f5 Mon Sep 17 00:00:00 2001
From: Naumov Alexey <Iamemptyhuh@gmail.com>
Date: Mon, 28 Mar 2022 20:16:08 +0200
Subject: [PATCH] feat(plugin-connections): CB-1822 CB-1824 style fixes

---
 .../core-blocks/src/Expand/EXPANDABLE_FORM_STYLES.ts   | 10 +++++-----
 webapp/packages/core-blocks/src/Expand/Expandable.tsx  |  3 ++-
 .../plugin-connections/src/ConnectionForm/SSH/SSH.tsx  |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/webapp/packages/core-blocks/src/Expand/EXPANDABLE_FORM_STYLES.ts b/webapp/packages/core-blocks/src/Expand/EXPANDABLE_FORM_STYLES.ts
index ca8b2f29e0..a7f55aa260 100644
--- a/webapp/packages/core-blocks/src/Expand/EXPANDABLE_FORM_STYLES.ts
+++ b/webapp/packages/core-blocks/src/Expand/EXPANDABLE_FORM_STYLES.ts
@@ -9,11 +9,11 @@
 import { css } from 'reshadow';
 
 export const EXPANDABLE_FORM_STYLES = css`
-  Disclosure:global([aria-expanded="true"]) {
-    margin-bottom: 10px;
-  }
   expand-label {
-    composes: theme-typography--body1 from global;
-    font-weight: 500;
+    composes: theme-typography--body2 from global;
+    font-weight: 400;
+    margin: 0;
+    text-transform: uppercase;
+    opacity: 0.9;
   }
 `;
\ No newline at end of file
diff --git a/webapp/packages/core-blocks/src/Expand/Expandable.tsx b/webapp/packages/core-blocks/src/Expand/Expandable.tsx
index ee7074c434..3c2b7093bf 100644
--- a/webapp/packages/core-blocks/src/Expand/Expandable.tsx
+++ b/webapp/packages/core-blocks/src/Expand/Expandable.tsx
@@ -47,6 +47,7 @@ const styles = css`
     width: 16px;
     height: 16px;
     transform: rotate(-90deg);
+    margin-right: 8px;
 
     &[|expanded] {
       transform: rotate(0deg);
@@ -75,7 +76,7 @@ export const Expandable = observer<Props, ExpandableState>(function Expandable({
         <expand-icon {...use({ expanded: disclosure.visible })}>
           <IconOrImage icon='arrow' />
         </expand-icon>
-        <expand-label>{label}</expand-label>
+        <expand-label as='h2'>{label}</expand-label>
       </Disclosure>
       <DisclosureContent {...disclosure}>
         <>{children}</>
diff --git a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
index 86aba4a071..f9e0b24f8d 100644
--- a/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
+++ b/webapp/packages/plugin-connections/src/ConnectionForm/SSH/SSH.tsx
@@ -216,7 +216,7 @@ export const SSH: TabContainerPanelComponent<IConnectionFormProps> = observer(fu
               {translate('connections_connection_edit_save_credentials')}
             </FieldCheckbox>
           )}
-          <Container>
+          <Container gap>
             <Expandable
               style={EXPANDABLE_FORM_STYLES}
               label={translate('connections_network_handler_ssh_tunnel_advanced_settings')}