[MERGE] *: migrate Bootstrap 3.3.7 to 4.1.3

See sub-commits for details.

task-49280
Closes https://github.com/odoo/odoo/pull/25045

3 files changed, 22 insertions, 22 deletions

diff --git a/addons/base_import/static/src/js/import_action.js b/addons/base_import/static/src/js/import_action.js
index 68dc6c663fa..7d91f2f1207 100644
--- a/addons/base_import/static/src/js/import_action.js
+++ b/addons/base_import/static/src/js/import_action.js
@@ -249,7 +249,7 @@ var DataImport = AbstractAction.extend(ControlPanelMixin, {
     //- File & settings change section
     onfile_loaded: function () {
         var file = this.$('.oe_import_file')[0].files[0];
-        this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').addClass('hidden');
+        this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').addClass('d-none');
         if (!this.$('input.oe_import_file').val()) { return this['settings_changed'](); }
         this.$('.oe_import_date_format').val('');
         this.$('.oe_import_datetime_format').val('');
@@ -268,7 +268,7 @@ var DataImport = AbstractAction.extend(ControlPanelMixin, {
     },
     onpreviewing: function () {
         var self = this;
-        this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').addClass('hidden');
+        this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').addClass('d-none');
         this.$el.addClass('oe_import_with_file');
         // TODO: test that write // succeeded?
         this.$el.removeClass('oe_import_preview_error oe_import_error');
@@ -287,10 +287,10 @@ var DataImport = AbstractAction.extend(ControlPanelMixin, {
     },
     onpreview_error: function (event, from, to, result) {
         this.$('.oe_import_options').show();
-        this.$buttons.filter('.o_import_file_reload').removeClass('hidden');
+        this.$buttons.filter('.o_import_file_reload').removeClass('d-none');
         this.$el.addClass('oe_import_preview_error oe_import_error');
-        this.$el.find('.oe_import_box, .oe_import_with_file').removeClass('hidden');
-        this.$el.find('.o_view_nocontent').addClass('hidden');
+        this.$el.find('.oe_import_box, .oe_import_with_file').removeClass('d-none');
+        this.$el.find('.o_view_nocontent').addClass('d-none');
         this.$('.oe_import_error_report').html(
                 QWeb.render('ImportView.preview.error', result));
     },
@@ -298,11 +298,11 @@ var DataImport = AbstractAction.extend(ControlPanelMixin, {
         var self = this;
         this.$buttons.filter('.oe_import_file')
             .text(_t('Load New File'))
-            .removeClass('btn-primary').addClass('btn-default')
+            .removeClass('btn-primary').addClass('btn-secondary')
             .blur();
-        this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').removeClass('hidden');
-        this.$el.find('.oe_import_box, .oe_import_with_file').removeClass('hidden');
-        this.$el.find('.o_view_nocontent').addClass('hidden');
+        this.$buttons.filter('.o_import_import, .o_import_validate, .o_import_file_reload').removeClass('d-none');
+        this.$el.find('.oe_import_box, .oe_import_with_file').removeClass('d-none');
+        this.$el.find('.o_view_nocontent').addClass('d-none');
         this.$el.addClass('oe_import_preview');
         this.$('input.oe_import_advanced_mode').prop('checked', result.advanced_mode);
         this.$('.oe_import_grid').html(QWeb.render('ImportView.preview', result));
diff --git a/addons/base_import/static/src/scss/base_import.scss b/addons/base_import/static/src/scss/base_import.scss
index 1ba7b05043f..acb91667d4e 100644
--- a/addons/base_import/static/src/scss/base_import.scss
+++ b/addons/base_import/static/src/scss/base_import.scss
@@ -6,7 +6,7 @@
     right: 0;
     bottom: 0;
     left: 0;
-    @media (max-width: $screen-xs-max) {
+    @include media-breakpoint-down(sm) {
         position: static;
     }
 
@@ -28,7 +28,7 @@
     .oe_import_box {
         padding: 8px;
         background: #F0EEEE;
-        border-radius: $border-radius-base;
+        border-radius: $border-radius;
         border: solid 1px #dddddd;
         label {
             font-weight: normal;
@@ -89,7 +89,7 @@
             padding: 4px;
             margin: 2px 0;
             list-style: none;
-            border-radius: $border-radius-base;
+            border-radius: $border-radius;
             &.bg-error {
                 @extend .bg-danger;
             }
@@ -122,7 +122,7 @@
 
 /* Field dropdown */
 .oe_import_selector {
-    font-size: $font-size-small;
+    font-size: $font-size-sm;
     ul, li {
         margin: 0; padding: 0;
     }
diff --git a/addons/base_import/static/src/xml/base_import.xml b/addons/base_import/static/src/xml/base_import.xml
index df9fbc3e5d1..80077e30d31 100644
--- a/addons/base_import/static/src/xml/base_import.xml
+++ b/addons/base_import/static/src/xml/base_import.xml
@@ -6,7 +6,7 @@
             <input type="hidden" name="session_id"
                t-att-value="widget.session.session_id"/>
             <input type="hidden" name="import_id"/>
-            <div class="oe_import_box col-md-12 hidden">
+            <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">
@@ -22,7 +22,7 @@
                                    t-att-value="option.value"/>
                         </p>
                     </div>
-                    <div class="oe_import_toggled oe_import_options col-sm-5">
+                    <div class="oe_import_toggled oe_import_options col-md-5">
                         <p t-foreach="widget.parse_opts" t-as="option">
                             <!-- no @name, avoid submission when file_update called -->
                             <label t-attf-for="#{option.name}_#{_id}">
@@ -35,7 +35,7 @@
                 </div>
             </div>
 
-            <div class="oe_import_with_file oe_padding col-sm-12 hidden">
+            <div class="oe_import_with_file oe_padding col-md-12 d-none">
                 <h2>Map your columns to import</h2>
                 <div title="If the model uses openchatter, history tracking
                             will set up subscriptions and send notifications
@@ -93,11 +93,11 @@
     </t>
 
     <t t-name="ImportView.buttons">
-        <button type="button" class="btn btn-sm btn-primary o_import_import hidden">Import</button>
-        <button type="button" class="btn btn-sm btn-default o_import_validate hidden">Test Import</button>
-        <button type="button" class="btn btn-sm btn-primary oe_import_file">Load File</button>
-        <button type="button" class="btn btn-sm btn-default o_import_file_reload hidden">Reload File</button>
-        <button type="button" class="btn btn-sm btn-default o_import_cancel">Cancel</button>
+        <button type="button" class="btn btn-primary o_import_import d-none">Import</button>
+        <button type="button" class="btn btn-secondary o_import_validate d-none">Test Import</button>
+        <button type="button" class="btn btn-primary oe_import_file">Load File</button>
+        <button type="button" class="btn btn-secondary o_import_file_reload d-none">Reload File</button>
+        <button type="button" class="btn btn-secondary o_import_cancel">Cancel</button>
     </t>
 
     <t t-name="ImportView.preview">
@@ -155,7 +155,7 @@
         <t t-if="error.moreinfo" t-raw="info(error.moreinfo)"/>
     </t>
     <t t-name="ImportView.import_button">
-        <button t-if='widget and widget.importEnabled' type="button" class="btn btn-sm btn-default o_button_import">
+        <button t-if='widget and widget.importEnabled' type="button" class="btn btn-secondary o_button_import">
             Import
         </button>
     </t>