diff options
| author | Phil Hughes <me@iamphill.com> | 2017-09-18 11:15:26 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-09-18 11:15:26 +0300 |
| commit | 79332ad090ff0b1434d2ac353c9cd26a6534d20c (patch) | |
| tree | 1d6c2670177870d2268d1fea9c8b091d608bc1d2 | |
| parent | d97b3fa478619fd6d75b25a89eff2c5bc519e1d5 (diff) | |
| parent | a17e8d9e888c9cdd431ca4e6bbd886cf557babf9 (diff) | |
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
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/builds.scss | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index ef58382ba41..48dc25d343b 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -78,16 +78,16 @@ .right-sidebar { border-left: 1px solid $border-color; - height: calc(100% - #{$header-height}); + height: calc(100% - #{$new-navbar-height}); &.affix { position: fixed; - top: $header-height; + top: $new-navbar-height; } } .with-performance-bar .right-sidebar.affix { - top: $header-height + $performance-bar-height; + top: $new-navbar-height + $performance-bar-height; } @mixin maintain-sidebar-dimensions { diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss index 50ec5110bf1..359dd388d05 100644 --- a/app/assets/stylesheets/pages/builds.scss +++ b/app/assets/stylesheets/pages/builds.scss @@ -64,10 +64,10 @@ color: $gl-text-color; position: sticky; position: -webkit-sticky; - top: $header-height; + top: $new-navbar-height; &.affix { - top: $header-height; + top: $new-navbar-height; } // with sidebar @@ -174,10 +174,10 @@ .with-performance-bar .build-page { .top-bar { - top: $header-height + $performance-bar-height; + top: $new-navbar-height + $performance-bar-height; &.affix { - top: $header-height + $performance-bar-height; + top: $new-navbar-height + $performance-bar-height; } } } |