diff options
| author | Phil Hughes <me@iamphill.com> | 2019-02-19 17:37:00 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-02-19 17:37:00 +0300 |
| commit | 1aae24ce099c8683c9b212cceb1c1a71137c1c48 (patch) | |
| tree | 1af6a935d81902bb02271b4120cfdd8079ba209d /app | |
| parent | 0aa64cf80ccd7fda10641af0cd43c4c0a7f3e133 (diff) | |
| parent | 91f12bc1088c3870d3ee39be5094e5ff3a51bf7a (diff) | |
Merge branch '57583-sticky-bar' into 'master'
Fixes the top position of job log topbar
Closes #57583
See merge request gitlab-org/gitlab-ce!25394
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/builds.scss | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss index 65f46e3852a..fa5a182243c 100644 --- a/app/assets/stylesheets/pages/builds.scss +++ b/app/assets/stylesheets/pages/builds.scss @@ -75,7 +75,11 @@ @include build-trace-top-bar(35px); &.has-archived-block { - top: $header-height + $performance-bar-height + 28px; + top: $header-height + 28px; + + .with-performance-bar & { + top: $header-height + $performance-bar-height + 28px; + } } &.affix { |