diff options
author | Phil Hughes <me@iamphill.com> | 2017-09-04 18:34:21 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-09-04 18:34:21 +0100 |
commit | 7dfb3a3f1c7e6901f656e22f36d4b2ba53312732 (patch) | |
tree | b282281723e0085788776a4c9ec5350636c9ed73 | |
parent | 789cc6787fff872693625565732cbbc18009ed2f (diff) | |
download | gitlab-ce-7dfb3a3f1c7e6901f656e22f36d4b2ba53312732.tar.gz |
Fix new_sidebar.scss being out of datenew-sidebar-scss-fix
-rw-r--r-- | app/assets/stylesheets/new_sidebar.scss | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss index faedd207e01..25c6715899b 100644 --- a/app/assets/stylesheets/new_sidebar.scss +++ b/app/assets/stylesheets/new_sidebar.scss @@ -70,8 +70,7 @@ $new-sidebar-collapsed-width: 50px; background-color: $white-light; } - .project-title, - .group-title { + .sidebar-context-title { overflow: hidden; text-overflow: ellipsis; } @@ -97,21 +96,28 @@ $new-sidebar-collapsed-width: 50px; top: $header-height; bottom: 0; left: 0; - overflow: auto; background-color: $gray-normal; box-shadow: inset -2px 0 0 $border-color; + transform: translate3d(0, 0, 0); &.sidebar-icons-only { width: $new-sidebar-collapsed-width; - overflow-x: hidden; + + .nav-sidebar-inner-scroll { + overflow-x: hidden; + } .badge, - .project-title { + .sidebar-context-title { display: none; } .nav-item-name { - opacity: 0; + display: none; + } + + .sidebar-top-level-items > li > a { + min-height: 44px; } } @@ -176,6 +182,12 @@ $new-sidebar-collapsed-width: 50px; } } +.nav-sidebar-inner-scroll { + height: 100%; + width: 100%; + overflow: auto; +} + .with-performance-bar .nav-sidebar { top: $header-height + $performance-bar-height; } |