From e1af325de812cb7fa62a7512b7830ef6024b4a8f Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 1 Sep 2017 16:06:28 +0100
Subject: [PATCH] Adds drop shadow to the expanded sidebar

Shadow is added in sm & md breakpoints. Clicking the anything outside of
the sidebar also hides collapses the sidebar at these breakpoints.

Closes #13983
---
 app/assets/javascripts/new_sidebar.js   | 5 +++++
 app/assets/stylesheets/new_sidebar.scss | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/app/assets/javascripts/new_sidebar.js b/app/assets/javascripts/new_sidebar.js
index 709a5d33b9f..fbe474f2f61 100644
--- a/app/assets/javascripts/new_sidebar.js
+++ b/app/assets/javascripts/new_sidebar.js
@@ -19,6 +19,11 @@ export default class NewNavSidebar {
   }
 
   bindEvents() {
+    document.addEventListener('click', (e) => {
+      if (!e.target.closest('.nav-sidebar') && (bp.getBreakpointSize() === 'sm' || bp.getBreakpointSize() === 'md')) {
+        this.toggleCollapsedSidebar(true);
+      }
+    });
     this.$openSidebar.on('click', () => this.toggleSidebarNav(true));
     this.$closeSidebar.on('click', () => this.toggleSidebarNav(false));
     this.$overlay.on('click', () => this.toggleSidebarNav(false));
diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss
index 3082f728ac8..378ef8926d5 100644
--- a/app/assets/stylesheets/new_sidebar.scss
+++ b/app/assets/stylesheets/new_sidebar.scss
@@ -99,6 +99,13 @@ $new-sidebar-collapsed-width: 50px;
   box-shadow: inset -2px 0 0 $border-color;
   transform: translate3d(0, 0, 0);
 
+  &:not(.sidebar-icons-only) {
+    @media (min-width: $screen-sm-min) and (max-width: $screen-md-max) {
+      box-shadow: inset -2px 0 0 $border-color,
+                  2px 1px 3px $dropdown-shadow-color;
+    }
+  }
+
   &.sidebar-icons-only {
     width: $new-sidebar-collapsed-width;