From 662f7ee62793537a3c83c9996477ef88771958f7 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 17 Aug 2017 14:31:02 +0000
Subject: Merge branch 'winh-collapsed-sidebar-scrolling' into 'master'

Prevent horizontal scrolling in new sidebar when collapsed

Closes #36608 and #36507

See merge request !13638
---
 app/assets/stylesheets/new_sidebar.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss
index 3d09adaf6a3..70e59392bcd 100644
--- a/app/assets/stylesheets/new_sidebar.scss
+++ b/app/assets/stylesheets/new_sidebar.scss
@@ -105,6 +105,10 @@ $new-sidebar-collapsed-width: 50px;
     width: $new-sidebar-collapsed-width;
     overflow-x: hidden;
 
+    .nav-sidebar-inner-scroll {
+      overflow-x: hidden;
+    }
+
     .badge,
     .project-title {
       display: none;
-- 
cgit v1.2.1