From 316f0907fccf889ae349574c7242ba8f45193e3c Mon Sep 17 00:00:00 2001
From: Zed <zhihe.li@hashicorp.com>
Date: Fri, 29 Apr 2022 10:16:34 -0400
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fix=20scrollbar=20for=20t?=
 =?UTF-8?q?he=20sidebar=20in=20desktop=20client=20(#1076)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixed scroll bar always appearing in sidebar on macOS for desktop client
and sidebar not staying fixed in windows and linux

✅ Closes: ICU-4143
---
 ui/desktop/app/styles/app.scss           | 17 +----------------
 ui/desktop/app/templates/application.hbs |  5 +----
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss
index 120390356..843daa102 100644
--- a/ui/desktop/app/styles/app.scss
+++ b/ui/desktop/app/styles/app.scss
@@ -39,22 +39,7 @@
 
   .rose-layout-sidebar-sidebar,
   .rose-layout-sidebar-body {
-    overflow-y: scroll;
-  }
-
-  &.layout-scroll {
-    .rose-layout-global-body {
-      overflow-y: auto;
-
-      main {
-        overflow: unset;
-      }
-    }
-
-    .rose-layout-sidebar-sidebar,
-    .rose-layout-sidebar-body {
-      overflow-y: unset;
-    }
+    overflow-y: auto;
   }
 }
 
diff --git a/ui/desktop/app/templates/application.hbs b/ui/desktop/app/templates/application.hbs
index 76923c4c4..6f208d1a8 100644
--- a/ui/desktop/app/templates/application.hbs
+++ b/ui/desktop/app/templates/application.hbs
@@ -1,9 +1,6 @@
 {{page-title (app-name)}}
 
-<Rose::Layout::Global
-  class='{{if this.showWindowActions ' layout-scroll'}}'
-  as |layout|
->
+<Rose::Layout::Global as |layout|>
 
   <layout.header>
     <Rose::Header