kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fix-new-merge-request-diff-headers-sticky-position' into 'master' 

Fixed sticky headers in merge request creation diff

Closes #57691

See merge request gitlab-org/gitlab-ce!26027
This commit is contained in:
Filipa Lacerda 2019-03-12 14:30:06 +00:00
parent a817f7905c d22d9dbcc9
commit cedeebf7bc
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/stylesheets/pages/merge_requests.scss
View File

@ -1019,3 +1019,13 @@
padding-left: 50px;
padding-bottom: $gl-padding;
}
.mr-compare {
.diff-file .file-title-flex-parent {
top: $header-height + 51px;
.with-performance-bar & {
top: $performance-bar-height + $header-height + 51px;
}
}
}

5
changelogs/unreleased/fix-new-merge-request-diff-headers-sticky-position.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fixed sticky headers in merge request creation diffs
merge_request:
author:
type: fixed