From cb6ad25e2b7ef83d044bc43ceae273f408299a19 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Thu, 9 Aug 2018 11:13:48 +0200
Subject: [PATCH] [FIX] base_import: import options layout

Broke during bootstrap 4 migration.
---
 addons/base_import/static/src/scss/base_import.scss | 2 --
 addons/base_import/static/src/xml/base_import.xml   | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/base_import/static/src/scss/base_import.scss b/addons/base_import/static/src/scss/base_import.scss
index acb91667d4e..f3686e7b448 100644
--- a/addons/base_import/static/src/scss/base_import.scss
+++ b/addons/base_import/static/src/scss/base_import.scss
@@ -60,7 +60,6 @@
     .oe_import_toggled,
     .oe_import_grid,
     .oe_import_error_report,
-    .oe_import_with_file,
     .oe_import_noheaders,
     .oe_import_report_more {
         display: none;
@@ -74,7 +73,6 @@
         display: table;
     }
     &.oe_import_error .oe_import_error_report,
-    &.oe_import_with_file .oe_import_with_file,
     &.oe_import_noheaders .oe_import_noheaders,
     .oe_import_report_showmore .oe_import_report_more {
         display: block;
diff --git a/addons/base_import/static/src/xml/base_import.xml b/addons/base_import/static/src/xml/base_import.xml
index a298517c74f..fb29ac0c9ea 100644
--- a/addons/base_import/static/src/xml/base_import.xml
+++ b/addons/base_import/static/src/xml/base_import.xml
@@ -9,8 +9,8 @@
             <div class="oe_import_box col-lg-12 d-none">
                 <input accept=".csv, .xls, .xlsx, .xlsm, .ods" t-attf-id="file_#{_id}"
                       name="file" class="oe_import_file" type="file" style="display:none;"/>
-                <div class="oe_import_with_file">
-                    <a href="#" class="oe_import_toggle">
+                <div class="oe_import_with_file row">
+                    <a href="#" class="oe_import_toggle col-sm-12">
                         Formatting Options…</a>
                     <div class="oe_import_toggled oe_import_options js_import_options col-sm-5">
                         <p t-foreach="widget.opts" t-as="option">