Commit 79332ad0 authored by Phil Hughes's avatar Phil Hughes

Merge branch '37857-build-header-gap' into 'master'

Remove gaps under nav on build page

Closes #37857

See merge request gitlab-org/gitlab-ce!14283
parents d97b3fa4 a17e8d9e
...@@ -78,16 +78,16 @@ ...@@ -78,16 +78,16 @@
.right-sidebar { .right-sidebar {
border-left: 1px solid $border-color; border-left: 1px solid $border-color;
height: calc(100% - #{$header-height}); height: calc(100% - #{$new-navbar-height});
&.affix { &.affix {
position: fixed; position: fixed;
top: $header-height; top: $new-navbar-height;
} }
} }
.with-performance-bar .right-sidebar.affix { .with-performance-bar .right-sidebar.affix {
top: $header-height + $performance-bar-height; top: $new-navbar-height + $performance-bar-height;
} }
@mixin maintain-sidebar-dimensions { @mixin maintain-sidebar-dimensions {
......
...@@ -64,10 +64,10 @@ ...@@ -64,10 +64,10 @@
color: $gl-text-color; color: $gl-text-color;
position: sticky; position: sticky;
position: -webkit-sticky; position: -webkit-sticky;
top: $header-height; top: $new-navbar-height;
&.affix { &.affix {
top: $header-height; top: $new-navbar-height;
} }
// with sidebar // with sidebar
...@@ -174,10 +174,10 @@ ...@@ -174,10 +174,10 @@
.with-performance-bar .build-page { .with-performance-bar .build-page {
.top-bar { .top-bar {
top: $header-height + $performance-bar-height; top: $new-navbar-height + $performance-bar-height;
&.affix { &.affix {
top: $header-height + $performance-bar-height; top: $new-navbar-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