Merge branch 'remove-mr-diff-header-height' into 'master'

Remove fixed height from MR diff headers

Closes #62596

See merge request gitlab-org/gitlab-ce!28946

app/assets/stylesheets/framework/files.scss

@@ -329,7 +329,7 @@ span.idiff {
     background-color: $gray-light;
     border-bottom: 1px solid $border-color;
     border-top: 1px solid $border-color;
-    padding: 5px $gl-padding;
+    padding: $gl-padding-8 $gl-padding;
     margin: 0;
     border-radius: $border-radius-default $border-radius-default 0 0;

app/assets/stylesheets/pages/diff.scss

@@ -15,7 +15,6 @@
       position: sticky;
       top: $mr-file-header-top;
       z-index: 102;
-      height: $mr-version-controls-height;
       &::before {
         content: '';

changelogs/unreleased/remove-mr-diff-header-height.yml

+---
+title: Remove fixed height from MR diff headers
+merge_request:
+author:
+type: other