summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2019-07-12 17:46:29 +0000
committerFatih Acet <acetfatih@gmail.com>2019-07-12 17:46:29 +0000
commit04954448b093a2bd6bdca454a78dfaed15fa4d8b (patch)
treefb5ad2c437a73bb97d42f95c5d8764b24c9981c9
parent740288f80d85210ada3eccc0f98e0843b2917d65 (diff)
parent56f84a34272a745f281c244f0846744345e4917e (diff)
downloadgitlab-ce-04954448b093a2bd6bdca454a78dfaed15fa4d8b.tar.gz
Merge branch 'z-index-fix-for-diff-file-dropdown' into 'master'
z-index fixed for diff file dropdown See merge request gitlab-org/gitlab-ce!30657
-rw-r--r--app/assets/stylesheets/pages/diff.scss2
-rw-r--r--changelogs/unreleased/z-index-fix-for-diff-file-dropdown.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 3ffe8ae304d..95ea49ad465 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -14,7 +14,7 @@
position: -webkit-sticky;
position: sticky;
top: $mr-file-header-top;
- z-index: 220;
+ z-index: 120;
&::before {
content: '';
diff --git a/changelogs/unreleased/z-index-fix-for-diff-file-dropdown.yml b/changelogs/unreleased/z-index-fix-for-diff-file-dropdown.yml
new file mode 100644
index 00000000000..72108f6ab77
--- /dev/null
+++ b/changelogs/unreleased/z-index-fix-for-diff-file-dropdown.yml
@@ -0,0 +1,5 @@
+---
+title: I fixed z index bug in diff page
+merge_request: 30657
+author: Faruk Can
+type: fixed