summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-03-18 14:07:58 +0000
committerPhil Hughes <me@iamphill.com>2019-03-18 14:07:58 +0000
commit9023cf710cb161360e5cda97ea2746cb66385092 (patch)
treed66f036f1c3b2a441db9b73592909c193c8d5ace
parentb24c0c8dcf39d967ec2bce343e0c1a7dd4dd5eb9 (diff)
parent9b77768850db0ef61d383a53b9d1ad284064caca (diff)
downloadgitlab-ce-9023cf710cb161360e5cda97ea2746cb66385092.tar.gz
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
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss2
-rw-r--r--changelogs/unreleased/58999-z-index-issue-on-pipeline-dropdown.yml6
2 files changed, 7 insertions, 1 deletions
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