summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-07-11 09:18:27 +0000
committerPhil Hughes <me@iamphill.com>2019-07-11 09:18:27 +0000
commit2a78554e4846033ab117d7964cbec48a0dbcd9e5 (patch)
tree47dca59771e1f1001798f008904e35e9ac7a2b19
parent2224207b3d86ca5ea0b01e1438388d0eda693a95 (diff)
parentf3657ad3f2391f1034fbb2a33a6cf2783e019984 (diff)
downloadgitlab-ce-2a78554e4846033ab117d7964cbec48a0dbcd9e5.tar.gz
Merge branch 'z-index-tools' into 'master'
Review Tools: Add large z-index to toolbar See merge request gitlab-org/gitlab-ce!30583
-rw-r--r--app/assets/javascripts/visual_review_toolbar/styles/toolbar.css1
-rw-r--r--changelogs/unreleased/z-index-tools.yml5
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/visual_review_toolbar/styles/toolbar.css b/app/assets/javascripts/visual_review_toolbar/styles/toolbar.css
index 00a55c0027a..6a7b2f52549 100644
--- a/app/assets/javascripts/visual_review_toolbar/styles/toolbar.css
+++ b/app/assets/javascripts/visual_review_toolbar/styles/toolbar.css
@@ -48,6 +48,7 @@
font-size: .8rem;
font-weight: 400;
color: #2e2e2e;
+ z-index: 9999; /* toolbar should always be on top */
}
.gitlab-wrapper-open {
diff --git a/changelogs/unreleased/z-index-tools.yml b/changelogs/unreleased/z-index-tools.yml
new file mode 100644
index 00000000000..1102612670b
--- /dev/null
+++ b/changelogs/unreleased/z-index-tools.yml
@@ -0,0 +1,5 @@
+---
+title: 'Review Tools: Add large z-index to toolbar'
+merge_request: 30583
+author:
+type: fixed