summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-08-11 08:37:45 +0000
committerJose Ivan Vargas <jvargas@gitlab.com>2017-08-18 11:56:00 -0500
commit64dbd32787b1b97102b20ea30f2ad3eb6a77ec62 (patch)
treeb43c48bcc8c182c5e0631355b8d6409cb4421165
parent5af35dba849650108b49336fe8074c3ef38be141 (diff)
downloadgitlab-ce-64dbd32787b1b97102b20ea30f2ad3eb6a77ec62.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 0f7fafa21a0..3d09adaf6a3 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 {