diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-17 14:31:02 +0000 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-08-18 11:57:31 -0500 |
| commit | 662f7ee62793537a3c83c9996477ef88771958f7 (patch) | |
| tree | 15448ff52849bc56f3f0c65abda8a38a865b9161 | |
| parent | 64dbd32787b1b97102b20ea30f2ad3eb6a77ec62 (diff) | |
| download | gitlab-ce-662f7ee62793537a3c83c9996477ef88771958f7.tar.gz | |
Merge branch 'winh-collapsed-sidebar-scrolling' into 'master'
Prevent horizontal scrolling in new sidebar when collapsed
Closes #36608 and #36507
See merge request !13638
| -rw-r--r-- | app/assets/stylesheets/new_sidebar.scss | 4 |
1 files changed, 4 insertions, 0 deletions
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; |