From 1d1e0b5f5f2c4d0dec64f59cd931f845e4951ede Mon Sep 17 00:00:00 2001
From: Martavis Parker <47053705+martavis@users.noreply.github.com>
Date: Mon, 20 Sep 2021 17:20:46 -0700
Subject: [PATCH] Fixed style for sidebar (#2154)

* fixed style for sidebar

* changes file

* Reduce minimum width of body-wrap to prevent right sidebar from overflowing min app width of 1200px

Co-authored-by: Noah Talerman <noahtal@umich.edu>
---
 changes/2107-sidebar-style                                   | 1 +
 .../side_panels/SecondarySidePanelContainer/_styles.scss     | 2 +-
 frontend/styles/global/_global.scss                          | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 changes/2107-sidebar-style

diff --git a/changes/2107-sidebar-style b/changes/2107-sidebar-style
new file mode 100644
index 0000000000..0a50d56a17
--- /dev/null
+++ b/changes/2107-sidebar-style
@@ -0,0 +1 @@
+- Fixed sidebar style
\ No newline at end of file
diff --git a/frontend/components/side_panels/SecondarySidePanelContainer/_styles.scss b/frontend/components/side_panels/SecondarySidePanelContainer/_styles.scss
index 430d613e77..31d90c0979 100644
--- a/frontend/components/side_panels/SecondarySidePanelContainer/_styles.scss
+++ b/frontend/components/side_panels/SecondarySidePanelContainer/_styles.scss
@@ -1,9 +1,9 @@
 .secondary-side-panel-container {
-  align-self: stretch;
   background-color: $core-white;
   box-sizing: border-box;
   border-left: 1px solid $ui-gray;
   overflow: auto;
+  min-width: $sidepanel-width;
   width: $sidepanel-width;
   padding: $pad-xxlarge;
 }
diff --git a/frontend/styles/global/_global.scss b/frontend/styles/global/_global.scss
index 586d4bb247..1e335648f7 100644
--- a/frontend/styles/global/_global.scss
+++ b/frontend/styles/global/_global.scss
@@ -55,11 +55,12 @@ a {
   border-radius: 3px;
   background-color: $core-white;
   border: solid 1px $core-white;
-  min-width: 910px;
+  min-width: 798px;
 }
 
 .has-sidebar {
   display: flex;
+  flex-grow: 1;
 
   & > *:first-child {
     flex-grow: 1;
@@ -121,4 +122,4 @@ hr {
   margin-bottom: $pad-xlarge;
   border: none;
   border-bottom: 1px solid $ui-fleet-blue-15;
-}
\ No newline at end of file
+}