summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Friend <nfriend@gitlab.com>2019-03-18 09:54:39 -0300
committerNathan Friend <nfriend@gitlab.com>2019-03-18 09:54:39 -0300
commit9b77768850db0ef61d383a53b9d1ad284064caca (patch)
tree01cc54b23d7e77845869b22c9eac67b1718465b7
parent8bc2474553f302d4feb41cb55ffb90c5b72e94c3 (diff)
downloadgitlab-ce-9b77768850db0ef61d383a53b9d1ad284064caca.tar.gz
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.
-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