From e4244f94ba973e0f72143b93c8a0e36835991a9d Mon Sep 17 00:00:00 2001
From: Philipp Hugenroth <philipph@spotify.com>
Date: Fri, 2 Jul 2021 14:46:19 +0200
Subject: [PATCH 1/2] Apply sidebar changes to create-app

Signed-off-by: Philipp Hugenroth <philipph@spotify.com>
---
 .changeset/shy-garlics-tap.md                                | 5 +++++
 .../default-app/packages/app/src/components/Root/Root.tsx    | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/shy-garlics-tap.md

diff --git a/.changeset/shy-garlics-tap.md b/.changeset/shy-garlics-tap.md
new file mode 100644
index 0000000000..7be84ddbb1
--- /dev/null
+++ b/.changeset/shy-garlics-tap.md
@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': patch
+---
+
+Use SidebarScrollWrapper to imporve responiveness of the current sidebar. Change: Wrap a section of SidebarItems with this component to enable scroll for smaller screens. It can also be used in sidebar plugins (see Shortcuts plugin for an example).
diff --git a/packages/create-app/templates/default-app/packages/app/src/components/Root/Root.tsx b/packages/create-app/templates/default-app/packages/app/src/components/Root/Root.tsx
index 5e5a71a635..d8665a2f9b 100644
--- a/packages/create-app/templates/default-app/packages/app/src/components/Root/Root.tsx
+++ b/packages/create-app/templates/default-app/packages/app/src/components/Root/Root.tsx
@@ -34,6 +34,7 @@ import {
   SidebarItem,
   SidebarDivider,
   SidebarSpace,
+  SidebarScrollWrapper,
 } from '@backstage/core-components';
 
 const useSidebarLogoStyles = makeStyles({
@@ -82,7 +83,9 @@ export const Root = ({ children }: PropsWithChildren<{}>) => (
       <SidebarItem icon={CreateComponentIcon} to="create" text="Create..." />
       {/* End global nav */}
       <SidebarDivider />
-      <SidebarItem icon={MapIcon} to="tech-radar" text="Tech Radar" />
+      <SidebarScrollWrapper>
+        <SidebarItem icon={MapIcon} to="tech-radar" text="Tech Radar" />
+      </SidebarScrollWrapper>
       <SidebarSpace />
       <SidebarDivider />
       <SidebarSettings />

From 86aa88803313305e8a39d6968218689d5b90e2ad Mon Sep 17 00:00:00 2001
From: Philipp Hugenroth <philipph@spotify.com>
Date: Fri, 2 Jul 2021 14:54:20 +0200
Subject: [PATCH 2/2] Fix changeset language issues

Signed-off-by: Philipp Hugenroth <philipph@spotify.com>
---
 .changeset/shy-garlics-tap.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/shy-garlics-tap.md b/.changeset/shy-garlics-tap.md
index 7be84ddbb1..58c660e864 100644
--- a/.changeset/shy-garlics-tap.md
+++ b/.changeset/shy-garlics-tap.md
@@ -2,4 +2,4 @@
 '@backstage/create-app': patch
 ---
 
-Use SidebarScrollWrapper to imporve responiveness of the current sidebar. Change: Wrap a section of SidebarItems with this component to enable scroll for smaller screens. It can also be used in sidebar plugins (see Shortcuts plugin for an example).
+Use SidebarScrollWrapper to improve responsiveness of the current sidebar. Change: Wrap a section of SidebarItems with this component to enable scroll for smaller screens. It can also be used in sidebar plugins (see shortcuts plugin for an example).