diff options
| author | Phil Hughes <me@iamphill.com> | 2019-02-19 17:37:00 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-02-20 16:33:36 +0300 |
| commit | 043f7a8360343ab8e6fc21a41d02040b28c923e3 (patch) | |
| tree | a75ea33cfa5a6ecfbd97f63f518a8a941163394c | |
| parent | 4dfb7853ebd0ba1c49fd8d69c2f93bb0c7a7c0da (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
(cherry picked from commit 1aae24ce099c8683c9b212cceb1c1a71137c1c48)
91f12bc1 Fixes the top position of job log topbar
| -rw-r--r-- | app/assets/stylesheets/pages/builds.scss | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/57583-sticky-bar.yml | 5 |
2 files changed, 10 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 { diff --git a/changelogs/unreleased/57583-sticky-bar.yml b/changelogs/unreleased/57583-sticky-bar.yml new file mode 100644 index 00000000000..c592343a409 --- /dev/null +++ b/changelogs/unreleased/57583-sticky-bar.yml @@ -0,0 +1,5 @@ +--- +title: Fixes archived sticky top bar without perfomance bar +merge_request: +author: +type: fixed |