summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-08-17 09:35:21 +0000
committerTim Zallmann <tzallmann@gitlab.com>2017-08-17 09:35:21 +0000
commit938e63ef4abe4915326b852945579877e4aa3c83 (patch)
tree7745309b64d8aebfc33dbce7e85ff221d4d6c74c
parent165e211ce3cde8fc7d71322d5f3acbd3e010a900 (diff)
parentcb1a3690f7d8047f20be62faf501ea339b10a45d (diff)
downloadgitlab-ce-938e63ef4abe4915326b852945579877e4aa3c83.tar.gz
Merge branch 'fixed-collapsed-sidebar-fly-out-not-showing' into 'master'
Fixed collapsed sidebar not showing fly-out menu See merge request !13622
-rw-r--r--app/assets/stylesheets/new_sidebar.scss7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss
index d078c8b956b..840a4f07a34 100644
--- a/app/assets/stylesheets/new_sidebar.scss
+++ b/app/assets/stylesheets/new_sidebar.scss
@@ -103,7 +103,6 @@ $new-sidebar-collapsed-width: 50px;
&.sidebar-icons-only {
width: $new-sidebar-collapsed-width;
- overflow-x: hidden;
.badge,
.project-title {
@@ -111,7 +110,11 @@ $new-sidebar-collapsed-width: 50px;
}
.nav-item-name {
- opacity: 0;
+ display: none;
+ }
+
+ .sidebar-top-level-items > li > a {
+ min-height: 44px;
}
}