BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 9c88832e by Tim Zallmann
Options

Merge branch 'new-sidebar-scss-fix' into '9-5-stable-patch-5'

Fix new_sidebar.scss being out of date See merge request !14035
parents 963958a3 7dfb3a3f
Showing with 15 additions and 2 deletions
app/assets/stylesheets/new_sidebar.scss
...@@ -96,13 +96,16 @@ $new-sidebar-collapsed-width: 50px; ...@@ -96,13 +96,16 @@ $new-sidebar-collapsed-width: 50px;
top: $header-height; top: $header-height;
bottom: 0; bottom: 0;
left: 0; left: 0;
overflow: auto;
background-color: $gray-normal; background-color: $gray-normal;
box-shadow: inset -2px 0 0 $border-color; box-shadow: inset -2px 0 0 $border-color;
transform: translate3d(0, 0, 0);
&.sidebar-icons-only { &.sidebar-icons-only {
width: $new-sidebar-collapsed-width; width: $new-sidebar-collapsed-width;
.nav-sidebar-inner-scroll {
overflow-x: hidden; overflow-x: hidden;
}
.badge, .badge,
.sidebar-context-title { .sidebar-context-title {
...@@ -110,7 +113,11 @@ $new-sidebar-collapsed-width: 50px; ...@@ -110,7 +113,11 @@ $new-sidebar-collapsed-width: 50px;
} }
.nav-item-name { .nav-item-name {
opacity: 0; display: none;
}
.sidebar-top-level-items > li > a {
min-height: 44px;
} }
} }
...@@ -175,6 +182,12 @@ $new-sidebar-collapsed-width: 50px; ...@@ -175,6 +182,12 @@ $new-sidebar-collapsed-width: 50px;
} }
} }
.nav-sidebar-inner-scroll {
height: 100%;
width: 100%;
overflow: auto;
}
.with-performance-bar .nav-sidebar { .with-performance-bar .nav-sidebar {
top: $header-height + $performance-bar-height; top: $header-height + $performance-bar-height;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment