Merge branch 'fix-collapsed-sidebar-item-height' into 'master'

Fix height of collapsed sidebar items See merge request !13385

Merge branch 'fix-collapsed-sidebar-item-height' into 'master'
d60f5ee4 · Phil Hughes · 705dbe61 · 2bb7f357 · d60f5ee4
Commit d60f5ee4 authored Aug 09, 2017 by Phil Hughes
Hide 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
@@ -104,11 +104,14 @@ $new-sidebar-collapsed-width: 50px;
  &.sidebar-icons-only {
    width: $new-sidebar-collapsed-width;

-    .nav-item-name,
    .badge,
    .project-title {
      display: none;
    }
+
+    .nav-item-name {
+      opacity: 0;
+    }
  }

  &.nav-sidebar-expanded {
@@ -361,7 +364,7 @@ $new-sidebar-collapsed-width: 50px;

 .sidebar-icons-only {
  .context-header {
-    height: 60px;
+    height: 61px;

    a {
      padding: 10px 4px;