From 2b16e92bbc1ffd35e1c708890d74140020655153 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Mon, 18 Mar 2019 14:07:58 +0000 Subject: Merge branch '58999-z-index-issue-on-pipeline-dropdown' into 'master' Resolve "Z-Index Issue on Pipeline Dropdown" Closes #58999 See merge request gitlab-org/gitlab-ce!26274 (cherry picked from commit 9023cf710cb161360e5cda97ea2746cb66385092) 9b777688 Fix z-index issue --- app/assets/stylesheets/pages/merge_requests.scss | 2 +- changelogs/unreleased/58999-z-index-issue-on-pipeline-dropdown.yml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/58999-z-index-issue-on-pipeline-dropdown.yml diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 126b00af552..ef6552fb265 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -806,7 +806,7 @@ .merge-request-tabs-holder { top: $header-height; - z-index: 300; + z-index: 250; background-color: $white-light; border-bottom: 1px solid $border-color; diff --git a/changelogs/unreleased/58999-z-index-issue-on-pipeline-dropdown.yml b/changelogs/unreleased/58999-z-index-issue-on-pipeline-dropdown.yml new file mode 100644 index 00000000000..9a7a0e5af37 --- /dev/null +++ b/changelogs/unreleased/58999-z-index-issue-on-pipeline-dropdown.yml @@ -0,0 +1,6 @@ +--- +title: Fix issue that caused the "Show all activity" button to appear on top of the + mini pipeline status dropdown on the merge request page +merge_request: 26274 +author: +type: fixed -- cgit v1.2.1