diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/assets/stylesheets/page_bundles/merge_requests.scss | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/assets/stylesheets/page_bundles/merge_requests.scss')
-rw-r--r-- | app/assets/stylesheets/page_bundles/merge_requests.scss | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss index 5553dffac05..be74503c21f 100644 --- a/app/assets/stylesheets/page_bundles/merge_requests.scss +++ b/app/assets/stylesheets/page_bundles/merge_requests.scss @@ -11,9 +11,19 @@ } .diff-tree-list { + // This 11px value should match the additional value found in + // /assets/stylesheets/framework/diffs.scss + // for the $mr-file-header-top SCSS variable within the + // .file-title, + // .file-title-flex-parent { + // rule. + // If they don't match, the file tree and the diff files stick + // to the top at different heights, which is a bad-looking defect + $diff-file-header-top: 11px; + $top-pos: $header-height + $mr-tabs-height + $mr-version-controls-height + $diff-file-header-top; + position: -webkit-sticky; position: sticky; - $top-pos: $header-height + $mr-tabs-height + $mr-version-controls-height + 15px; top: $top-pos; max-height: calc(100vh - #{$top-pos}); z-index: 202; |