diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-18 18:10:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-18 18:10:54 +0000 |
| commit | 042cd704b8177e7997af4a2ca90967d3178ccc3f (patch) | |
| tree | 06fec320acf76fbb87df66810cd75fe4e7f2357c /app/assets/stylesheets | |
| parent | 346c2ebb5a818524c5d8d95dc6b9fc8c892e3b5c (diff) | |
| download | gitlab-ce-042cd704b8177e7997af4a2ca90967d3178ccc3f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/framework/diffs.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/page_bundles/merge_requests.scss | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/diffs.scss b/app/assets/stylesheets/framework/diffs.scss index dd0c0bd9b60..a07e0b48cff 100644 --- a/app/assets/stylesheets/framework/diffs.scss +++ b/app/assets/stylesheets/framework/diffs.scss @@ -729,7 +729,7 @@ table.code { } .files { - .diff-file:last-child { + .diff-file:not(.is-virtual-scrolling):last-child { margin-bottom: 0; } } diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss index 9fdc30359f8..5e9dd883635 100644 --- a/app/assets/stylesheets/page_bundles/merge_requests.scss +++ b/app/assets/stylesheets/page_bundles/merge_requests.scss @@ -7,6 +7,10 @@ .diff-files-holder { flex: 1; min-width: 0; + + .vue-recycle-scroller__item-wrapper { + overflow: visible; + } } .with-system-header { |