diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-17 14:31:02 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-17 14:31:02 +0000 |
| commit | eed96cbde1c579f5d45d13d18c8e6024e3026db8 (patch) | |
| tree | 5f2f64167fc49c03fca8f893a9a495670917215c | |
| parent | 87ba1808db4279bc65fb7097d7bc19d7c23215d1 (diff) | |
| parent | 529d5908fa1c18501031445b4c77435cdcc4b72d (diff) | |
| download | gitlab-ce-eed96cbde1c579f5d45d13d18c8e6024e3026db8.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 840a4f07a34..cee5b22adb9 100644 --- a/app/assets/stylesheets/new_sidebar.scss +++ b/app/assets/stylesheets/new_sidebar.scss @@ -104,6 +104,10 @@ $new-sidebar-collapsed-width: 50px; &.sidebar-icons-only { width: $new-sidebar-collapsed-width; + .nav-sidebar-inner-scroll { + overflow-x: hidden; + } + .badge, .project-title { display: none; |