From 5bf7ac5509e82f446c240fc545f8fbcd8e6a8402 Mon Sep 17 00:00:00 2001
From: jerasmus <jerasmus@gitlab.com>
Date: Thu, 4 Sep 2025 12:50:32 +0200
Subject: [PATCH] Fix FTB toggle layout shift

Ensures the stop spacing between expanded/collapses states match
---
 .../repository/file_tree_browser/file_tree_browser.vue          | 2 +-
 app/assets/stylesheets/page_bundles/tree.scss                   | 2 +-
 app/views/projects/_files.html.haml                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/repository/file_tree_browser/file_tree_browser.vue b/app/assets/javascripts/repository/file_tree_browser/file_tree_browser.vue
index eab5023b9453d1..a5775a972fbe08 100644
--- a/app/assets/javascripts/repository/file_tree_browser/file_tree_browser.vue
+++ b/app/assets/javascripts/repository/file_tree_browser/file_tree_browser.vue
@@ -60,7 +60,7 @@ export default {
 <template>
   <file-browser-height
     :style="{ '--tree-width': `${treeWidth}px` }"
-    class="repository-tree-list repository-tree-list-responsive gl-mt-5 gl-px-4"
+    class="repository-tree-list repository-tree-list-responsive gl-mt-4 gl-px-4"
   >
     <panel-resizer
       class="max-lg:gl-hidden"
diff --git a/app/assets/stylesheets/page_bundles/tree.scss b/app/assets/stylesheets/page_bundles/tree.scss
index 4f02ab3652eb8d..c3197449597145 100644
--- a/app/assets/stylesheets/page_bundles/tree.scss
+++ b/app/assets/stylesheets/page_bundles/tree.scss
@@ -15,7 +15,7 @@ $bottom-padding: $gl-spacing-scale-6;
   --file-tree-min-height: 300px;
   --file-tree-bottom-padding: #{rem-to-px($bottom-padding)};
   position: sticky;
-  top: calc(var(--application-header-height) + #{$gl-spacing-scale-5});
+  top: calc(var(--application-header-height) + #{$gl-spacing-scale-4});
   min-height: var(--file-tree-min-height);
   flex: none;
 
diff --git a/app/views/projects/_files.html.haml b/app/views/projects/_files.html.haml
index ca1cfa74f5b09d..3177953846f602 100644
--- a/app/views/projects/_files.html.haml
+++ b/app/views/projects/_files.html.haml
@@ -13,7 +13,7 @@
   .gl-flex.navigation-root
     #js-file-browser
     .gl-w-full.gl-min-w-0.gl-pl-4
-      #tree-holder.tree-holder.gl-clearfix.js-per-page.gl-mt-5{ data: { blame_per_page: Gitlab::Git::BlamePagination::PAGINATION_PER_PAGE } }
+      #tree-holder.tree-holder.gl-clearfix.js-per-page.gl-mt-4{ data: { blame_per_page: Gitlab::Git::BlamePagination::PAGINATION_PER_PAGE } }
         = render 'projects/tree_content', project: project, ref: ref, pipeline: pipeline, tree: @tree, ref_type: @ref_type
 - else
   #tree-holder.tree-holder.gl-clearfix.js-per-page.gl-mt-5{ data: { blame_per_page: Gitlab::Git::BlamePagination::PAGINATION_PER_PAGE } }
-- 
GitLab