From 9b77768850db0ef61d383a53b9d1ad284064caca Mon Sep 17 00:00:00 2001 From: Nathan Friend Date: Mon, 18 Mar 2019 09:54:39 -0300 Subject: [PATCH] Fix z-index issue This commit lowers the z-index of the .merge-request-tabs-holder class to avoid rendering conflicts with the mini pipeline status dropdown on the merge request page. --- app/assets/stylesheets/pages/merge_requests.scss | 2 +- .../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 44556060c65..df3a4be6559 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