diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-03-12 14:30:06 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-03-12 14:30:06 +0000 |
| commit | cedeebf7bcbfe7dd006edb853e6c84d0c504c1a1 (patch) | |
| tree | 1b89b25bf8dbafe55372b8df0c7782b3fdffdbd8 | |
| parent | a817f7905c084f725b6fa01955be4fd8ad28c747 (diff) | |
| parent | d22d9dbcc9c79276044266e807571e1675a802af (diff) | |
| download | gitlab-ce-cedeebf7bcbfe7dd006edb853e6c84d0c504c1a1.tar.gz | |
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
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-new-merge-request-diff-headers-sticky-position.yml | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 126b00af552..44556060c65 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -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; + } + } +} diff --git a/changelogs/unreleased/fix-new-merge-request-diff-headers-sticky-position.yml b/changelogs/unreleased/fix-new-merge-request-diff-headers-sticky-position.yml new file mode 100644 index 00000000000..dadbd5c940f --- /dev/null +++ b/changelogs/unreleased/fix-new-merge-request-diff-headers-sticky-position.yml @@ -0,0 +1,5 @@ +--- +title: Fixed sticky headers in merge request creation diffs +merge_request: +author: +type: fixed |