summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-03-18 14:07:58 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-03-25 10:53:23 +0000
commit2b16e92bbc1ffd35e1c708890d74140020655153 (patch)
treed1884bb5a4a0916ba4919339cf7a6c83d553f08d
parenta47124c78529ca0f41fad3cd59cbbcf49b7eec2e (diff)
downloadgitlab-ce-2b16e92bbc1ffd35e1c708890d74140020655153.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 (cherry picked from commit 9023cf710cb161360e5cda97ea2746cb66385092) 9b777688 Fix z-index issue
-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 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