diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-02-19 13:09:38 +0000 |
---|---|---|
committer | mfluharty <mfluharty@gitlab.com> | 2019-02-20 11:20:34 -0700 |
commit | 2ce55ef83293dffd679e4c6085a7558502691cfd (patch) | |
tree | 1ab4fadd3a1333792d154f14e0fc54d34c93c10d | |
parent | 25938249d025a206ce4355f3956a9247ccbe1bd6 (diff) | |
download | gitlab-ce-2ce55ef83293dffd679e4c6085a7558502691cfd.tar.gz |
Fixes the top position of job log topbar
The top bar of the job log was always expecting the
performance bar to be enabled. This commit adds CSS
to fix the top position for both scenarios.
-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 |