summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-08-11 08:37:45 +0000
committerPhil Hughes <me@iamphill.com>2017-08-11 08:37:45 +0000
commitcfc5f0f5e4cb5a9b52aaf81d1c80c2d7774279a6 (patch)
tree8250cb9d42a16d3c0e5b984a75237c3724dd15cb
parentfbd226ae48f54415d5ff566848668c2d932fd57a (diff)
parent474a8982040e095f084772527d2c8beed67173bc (diff)
downloadgitlab-ce-cfc5f0f5e4cb5a9b52aaf81d1c80c2d7774279a6.tar.gz
Merge branch '36270-collapsed-sidebar-scroll' into 'master'
Remove horizontal scroll on collapsed sidebar Closes #36270 See merge request !13458
-rw-r--r--app/assets/stylesheets/new_sidebar.scss1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss
index 4367b8c1a15..d49f23b4f5a 100644
--- a/app/assets/stylesheets/new_sidebar.scss
+++ b/app/assets/stylesheets/new_sidebar.scss
@@ -103,6 +103,7 @@ $new-sidebar-collapsed-width: 50px;
&.sidebar-icons-only {
width: $new-sidebar-collapsed-width;
+ overflow-x: hidden;
.badge,
.project-title {