Merge branch '233002-diff-file-input-cutoff' into 'master'

Fix top position of diff file search

Closes #233002

See merge request gitlab-org/gitlab!40634

app/assets/javascripts/diffs/components/app.vue

@@ -468,7 +468,7 @@ export default {
 
       <div
         :data-can-create-note="getNoteableData.current_user.can_create_note"
-        class="files d-flex"
+        class="files d-flex gl-mt-2"
       >
         <div
           v-if="showTreeList"

app/assets/stylesheets/pages/diff.scss

@@ -1062,7 +1062,7 @@ table.code {
 .diff-tree-list {
   position: -webkit-sticky;
   position: sticky;
-  $top-pos: $header-height + $mr-tabs-height + $mr-version-controls-height + 11px;
+  $top-pos: $header-height + $mr-tabs-height + $mr-version-controls-height + 15px;
   top: $top-pos;
   max-height: calc(100vh - #{$top-pos});
   z-index: 202;

changelogs/unreleased/233002-diff-file-input-cutoff.yml

+---
+title: Fix file file input top position cutoff
+merge_request: 40634
+author:
+type: fixed