From aa4997f92e5687843af4cef4b4593a70db17db87 Mon Sep 17 00:00:00 2001
From: Oiza Baiye <obaiye@gitlab.com>
Date: Fri, 26 Sep 2025 23:13:00 +0300
Subject: [PATCH 1/6] Add .table-responsive class to import_projects_table

---
 .../import_projects/components/import_projects_table.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue b/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue
index 9a0c94a7d00087..c147283b9ccb79 100644
--- a/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue
+++ b/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue
@@ -183,7 +183,7 @@ export default {
         )
       }}
     </gl-modal>
-    <div v-if="repositories.length" class="gl-w-full">
+    <div v-if="repositories.length" class="table-responsive gl-w-full">
       <table class="table gl-table">
         <thead>
           <tr>
-- 
GitLab


From 6a1858cb117c5ce887face7e9b6cc1ac573478a1 Mon Sep 17 00:00:00 2001
From: Oiza Baiye <obaiye@gitlab.com>
Date: Sat, 27 Sep 2025 00:36:30 +0300
Subject: [PATCH 2/6] Remove sticky header in direct transfer table, fix button
 stack

---
 .../import_groups/components/import_table.vue               | 6 +++---
 app/assets/stylesheets/page_bundles/import.scss             | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
index f57c5c8fd8da0a..ce599f2aa144c5 100644
--- a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
+++ b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
@@ -773,7 +773,7 @@ export default {
           />
         </div>
         <div
-          class="import-table-bar gl-sticky gl-z-3 gl-flex-col gl-bg-subtle gl-px-5 @md/panel:gl-flex @md/panel:gl-flex-row @md/panel:gl-items-center @md/panel:gl-justify-between"
+          class="gl-sticky gl-z-3 gl-flex-col gl-bg-subtle gl-px-5 @md/panel:gl-flex @md/panel:gl-flex-row @md/panel:gl-items-center @md/panel:gl-justify-between"
         >
           <div class="gl-flex gl-w-full gl-items-center gl-gap-4 gl-pb-4">
             <span data-testid="selection-count">
@@ -827,7 +827,7 @@ export default {
           class="import-table gl-w-full"
           :tbody-tr-class="rowClasses"
           :tbody-tr-attr="qaRowAttributes"
-          thead-class="gl-sticky gl-z-2 gl-bg-default"
+          thead-class="gl-z-2 gl-bg-default"
           :items="groupsTableData"
           :fields="$options.fields"
           selectable
@@ -883,13 +883,13 @@ export default {
               :is-available-for-import="group.flags.isAvailableForImport"
               :is-invalid="group.flags.isInvalid"
               :is-project-creation-allowed="group.flags.isProjectCreationAllowed"
+              class="gl-mb-3"
               @import-group="importGroup({ group, extraArgs: $event, index })"
             />
             <import-history-link
               v-if="showHistoryLink(group)"
               :id="group.progress.id"
               :history-path="historyShowPath"
-              class="gl-mt-3"
             />
           </template>
         </gl-table>
diff --git a/app/assets/stylesheets/page_bundles/import.scss b/app/assets/stylesheets/page_bundles/import.scss
index ddda45d9ef0686..e85e2612ef6a88 100644
--- a/app/assets/stylesheets/page_bundles/import.scss
+++ b/app/assets/stylesheets/page_bundles/import.scss
@@ -2,10 +2,6 @@
 
 $import-bar-height: calc(#{$gl-spacing-scale-9} - 1px);
 
-.import-table-bar {
-  top: $calc-application-header-height;
-}
-
 .import-table {
   thead {
     top: calc(#{$calc-application-header-height} + #{$import-bar-height});
-- 
GitLab


From 35a7ac81ebce7a5174819009ffc5592543712f28 Mon Sep 17 00:00:00 2001
From: Oiza Baiye <obaiye@gitlab.com>
Date: Wed, 1 Oct 2025 15:15:45 +0300
Subject: [PATCH 3/6] Put back header styling for direct transfer table

---
 .../import_groups/components/import_table.vue                | 4 ++--
 app/assets/stylesheets/page_bundles/import.scss              | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
index ce599f2aa144c5..0fa9b7cfe661da 100644
--- a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
+++ b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
@@ -773,7 +773,7 @@ export default {
           />
         </div>
         <div
-          class="gl-sticky gl-z-3 gl-flex-col gl-bg-subtle gl-px-5 @md/panel:gl-flex @md/panel:gl-flex-row @md/panel:gl-items-center @md/panel:gl-justify-between"
+          class="import-table-bar gl-sticky gl-z-3 gl-flex-col gl-bg-subtle gl-px-5 @md/panel:gl-flex @md/panel:gl-flex-row @md/panel:gl-items-center @md/panel:gl-justify-between"
         >
           <div class="gl-flex gl-w-full gl-items-center gl-gap-4 gl-pb-4">
             <span data-testid="selection-count">
@@ -827,7 +827,7 @@ export default {
           class="import-table gl-w-full"
           :tbody-tr-class="rowClasses"
           :tbody-tr-attr="qaRowAttributes"
-          thead-class="gl-z-2 gl-bg-default"
+          thead-class="gl-sticky gl-z-2 gl-bg-default"
           :items="groupsTableData"
           :fields="$options.fields"
           selectable
diff --git a/app/assets/stylesheets/page_bundles/import.scss b/app/assets/stylesheets/page_bundles/import.scss
index e85e2612ef6a88..80d884035fd75d 100644
--- a/app/assets/stylesheets/page_bundles/import.scss
+++ b/app/assets/stylesheets/page_bundles/import.scss
@@ -2,6 +2,11 @@
 
 $import-bar-height: calc(#{$gl-spacing-scale-9} - 1px);
 
+
+.import-table-bar {
+  top: $calc-application-header-height;
+}
+
 .import-table {
   thead {
     top: calc(#{$calc-application-header-height} + #{$import-bar-height});
-- 
GitLab


From c7835be2fe5b65324f687d7073af17c09fe280ef Mon Sep 17 00:00:00 2001
From: Oiza Baiye <obaiye@gitlab.com>
Date: Wed, 1 Oct 2025 15:27:36 +0300
Subject: [PATCH 4/6] Reduce gap between thead and selection bar

---
 app/assets/stylesheets/page_bundles/import.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/page_bundles/import.scss b/app/assets/stylesheets/page_bundles/import.scss
index 80d884035fd75d..2a2de6f22603b7 100644
--- a/app/assets/stylesheets/page_bundles/import.scss
+++ b/app/assets/stylesheets/page_bundles/import.scss
@@ -9,6 +9,6 @@ $import-bar-height: calc(#{$gl-spacing-scale-9} - 1px);
 
 .import-table {
   thead {
-    top: calc(#{$calc-application-header-height} + #{$import-bar-height});
+    top: calc(#{$calc-application-header-height} + #{$import-bar-height} - 4px);
   }
 }
-- 
GitLab


From 3e08545a78df016ee3e117fb2e61777d58fc16d6 Mon Sep 17 00:00:00 2001
From: Oiza Baiye <obaiye@gitlab.com>
Date: Wed, 1 Oct 2025 16:16:40 +0300
Subject: [PATCH 5/6] Run linter to remove extra line

---
 app/assets/stylesheets/page_bundles/import.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/stylesheets/page_bundles/import.scss b/app/assets/stylesheets/page_bundles/import.scss
index 2a2de6f22603b7..56ca68f0d8bfd6 100644
--- a/app/assets/stylesheets/page_bundles/import.scss
+++ b/app/assets/stylesheets/page_bundles/import.scss
@@ -2,7 +2,6 @@
 
 $import-bar-height: calc(#{$gl-spacing-scale-9} - 1px);
 
-
 .import-table-bar {
   top: $calc-application-header-height;
 }
-- 
GitLab


From 816ff4757a60b89c3fc83b1bdc2d8d50561445c5 Mon Sep 17 00:00:00 2001
From: Oiza Baiye <obaiye@gitlab.com>
Date: Thu, 2 Oct 2025 16:37:43 +0300
Subject: [PATCH 6/6] Use rem for bar height

---
 app/assets/stylesheets/page_bundles/import.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/page_bundles/import.scss b/app/assets/stylesheets/page_bundles/import.scss
index 56ca68f0d8bfd6..a413081c1da512 100644
--- a/app/assets/stylesheets/page_bundles/import.scss
+++ b/app/assets/stylesheets/page_bundles/import.scss
@@ -1,6 +1,6 @@
 @import 'mixins_and_variables_and_functions';
 
-$import-bar-height: calc(#{$gl-spacing-scale-9} - 1px);
+$import-bar-height: calc(2.75rem - 1px);
 
 .import-table-bar {
   top: $calc-application-header-height;
@@ -8,6 +8,6 @@ $import-bar-height: calc(#{$gl-spacing-scale-9} - 1px);
 
 .import-table {
   thead {
-    top: calc(#{$calc-application-header-height} + #{$import-bar-height} - 4px);
+    top: calc(#{$calc-application-header-height} + #{$import-bar-height});
   }
 }
-- 
GitLab