From d5bf431aba3cb571be9e91fd8beff12ccd83d7fb Mon Sep 17 00:00:00 2001
From: "Chrysanthe (chgo)" <chgo@odoo.com>
Date: Tue, 6 Jun 2023 14:53:16 +0000
Subject: [PATCH] [FIX] base_import: cp button spacing

=== ISSUE ===

If you go to PLM > click on a primary button > click on the cog >
import  records, the buttons have a `.m-1` which is added on top
of a `.gap-1`.This result in a double margin, which is not consistent
with other CP's behavior and affects the whole CP layout.

=== AFTER ===

We remove these unnecessary `.m-1`, making sure that no matter how many
buttons are shown they have a correct spacing.

task-3355375
part of task-3326263

closes odoo/odoo#124337

X-original-commit: 40666bfe89ff5bc9013fbb20928c18001b66c6ad
Signed-off-by: Pierre Paridans (app) <app@odoo.com>
---
 .../static/src/import_action/import_action.xml       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/base_import/static/src/import_action/import_action.xml b/addons/base_import/static/src/import_action/import_action.xml
index 1c8958fcbfc..56efaa502ee 100644
--- a/addons/base_import/static/src/import_action/import_action.xml
+++ b/addons/base_import/static/src/import_action/import_action.xml
@@ -5,9 +5,9 @@
             <Layout className="'o_import_action d-flex h-100 overflow-auto bg-white'" display="display">
                 <t t-set-slot="control-panel-create-button">
                     <t t-if="isPreviewing">
-                        <button t-if="!state.isPaused" type="button" class="btn btn-primary m-1" t-on-click="() => this.handleImport(false)">Import</button>
-                        <button t-else="" type="button" class="btn btn-primary m-1" t-on-click="() => this.handleImport(false)">Resume</button>
-                        <button type="button" class="btn btn-secondary m-1" t-on-click="() => this.handleImport(true)">Test</button>
+                        <button t-if="!state.isPaused" type="button" class="btn btn-primary" t-on-click="() => this.handleImport(false)">Import</button>
+                        <button t-else="" type="button" class="btn btn-primary" t-on-click="() => this.handleImport(false)">Resume</button>
+                        <button type="button" class="btn btn-secondary" t-on-click="() => this.handleImport(true)">Test</button>
                     </t>
                     <FileInput
                         acceptedFileExtensions="'.csv, .xls, .xlsx, .xlsm, .ods'"
@@ -16,10 +16,10 @@
                         resModel="this.resModel"
                         route="'/base_import/set_file'"
                     >
-                        <button t-if="isPreviewing" type="button" class="btn btn-secondary m-1">Load File</button>
-                        <button t-else="" type="button" class="btn btn-primary m-1 o_import_file">Upload File</button>
+                        <button t-if="isPreviewing" type="button" class="btn btn-secondary">Load File</button>
+                        <button t-else="" type="button" class="btn btn-primary o_import_file">Upload File</button>
                     </FileInput>
-                    <button t-on-click="exit" type="button" class="btn btn-secondary m-1">Cancel</button>
+                    <button t-on-click="exit" type="button" class="btn btn-secondary">Cancel</button>
                 </t>
                 <t t-if="isPreviewing">
                     <ImportDataSidepanel