From 6d7624bc9f8b084e33e863fc2024211e38dec3bf Mon Sep 17 00:00:00 2001
From: Cameron Perera <cameron.perera@hashicorp.com>
Date: Mon, 11 Sep 2023 12:15:06 -0500
Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20fix=20proxy-url=20to?=
 =?UTF-8?q?=20render=20above=20body=20and=20sidebar=20(#1893)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/desktop/app/components/session/tabs/index.hbs | 14 +++++++-------
 ui/desktop/app/styles/app.scss                   |  1 -
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ui/desktop/app/components/session/tabs/index.hbs b/ui/desktop/app/components/session/tabs/index.hbs
index f9f3713ee..a14a3203d 100644
--- a/ui/desktop/app/components/session/tabs/index.hbs
+++ b/ui/desktop/app/components/session/tabs/index.hbs
@@ -9,15 +9,15 @@
     {{t 'resources.session.shell'}}
   </T.Tab>
   <T.Panel>
+    {{#if (and @model.proxy_address @model.proxy_port)}}
+      <Session::ProxyUrl
+        @proxyAddress={{@model.proxy_address}}
+        @proxyPort={{@model.proxy_port}}
+        @isSSHTarget={{@model.target.isSSH}}
+      />
+    {{/if}}
     <Rose::Layout::BodyContent as |bc|>
       <bc.Body>
-        {{#if (and @model.proxy_address @model.proxy_port)}}
-          <Session::ProxyUrl
-            @proxyAddress={{@model.proxy_address}}
-            @proxyPort={{@model.proxy_port}}
-            @isSSHTarget={{@model.target.isSSH}}
-          />
-        {{/if}}
         {{#if @model.credentials}}
           <CredentialsPanel @credentials={{@model.credentials}} />
         {{else}}
diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss
index a1c80fcc8..dc3a90db9 100644
--- a/ui/desktop/app/styles/app.scss
+++ b/ui/desktop/app/styles/app.scss
@@ -516,7 +516,6 @@ $chevron-down: url("data:image/svg+xml;utf-8,<svg viewBox='0 0 24 24' fill='%231
   background-color: var(--token-color-palette-neutral-50);
   border-radius: 0.313rem;
   padding: 1.5rem 2.5rem;
-  margin-top: 3.5rem;
 
   > :not(:last-child) {
     margin-bottom: 2.25rem;