diff options
author | Fatih Acet <acetfatih@gmail.com> | 2018-06-28 14:47:04 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2018-06-28 14:47:04 +0300 |
commit | e4406170c603c80753a95340550c68ec3484dab1 (patch) | |
tree | a1e7c26038bc9bbfe047972bc79ffaef648b250c /app | |
parent | eaa9d4fd75252861bb733951b7571d7aea66fd66 (diff) | |
parent | faccba0c56f69634e4d895bfe15bb718df884f5d (diff) |
Merge branch '48497-merge-request-refactor-displays-changes-dropdown-incorrectly' into 'master'
Resolve "Merge request refactor displays changes dropdown incorrectly"
Closes #48497
See merge request gitlab-org/gitlab-ce!20237
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 7b8e66b6f12..d652982410a 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -698,7 +698,7 @@ &.diff-files-changed-merge-request { position: sticky; top: 90px; - z-index: 190; + z-index: 200; margin: $gl-padding 0; padding: 0; } @@ -706,6 +706,7 @@ &.is-stuck { padding-top: 0; padding-bottom: 0; + border-top: 1px solid $white-dark; border-bottom: 1px solid $white-dark; .diff-stats-additions-deletions-expanded, |