Merge branch 'fixed-collapsed-sidebar-fly-out-not-showing' into 'master'

Fixed collapsed sidebar not showing fly-out menu See merge request !13622

Merge branch 'fixed-collapsed-sidebar-fly-out-not-showing' into 'master'
938e63ef · Tim Zallmann · 165e211c · cb1a3690 · 938e63ef
Commit 938e63ef authored Aug 17, 2017 by Tim Zallmann
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

new_sidebar.scss app/assets/stylesheets/new_sidebar.scss +5 -2

No files found.
--- 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;
    }
  }