From 7f10b55a5035bd3cab48ba58a519510a25b94f60 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Tue, 24 Apr 2018 17:15:00 +0200
Subject: [REF] *: BS4, adapt display classes

The system completely changed. I also had to adapt classes to new
screen breakpoints.

hidden/hide -> d-none
show -> d-block
hidden-xs -> d-none d-md-(block/inline/...)
hidden-sm -> d-md-none d-lg-(block/inline/...)
hidden-md -> d-lg-none d-xl-(block/inline/...)
hidden-lg -> d-xl-none
visible-xs-* -> d-* d-md-none
visible-sm-* -> d-none d-md-* d-lg-none
visible-md-* -> d-none d-lg-* d-xl-none
visible-lg-* -> d-none d-xl-*
hidden-print -> d-print-none
visible-print-* -> d-none d-print-*
...
and all possible combination of those had to be handled too.
---
 addons/base_import/static/src/xml/base_import.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/base_import/static/src/xml/base_import.xml')

diff --git a/addons/base_import/static/src/xml/base_import.xml b/addons/base_import/static/src/xml/base_import.xml
index df9fbc3e5d1..95b54b5a5af 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-md-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">
@@ -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-sm-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,10 +93,10 @@
     </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 o_import_import d-none">Import</button>
+        <button type="button" class="btn btn-sm btn-default o_import_validate d-none">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_file_reload d-none">Reload File</button>
         <button type="button" class="btn btn-sm btn-default o_import_cancel">Cancel</button>
     </t>
 
-- 
cgit v1.2.3


From 81f359c81c69af2a5ec0645602e2bb43b2e16721 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Fri, 27 Apr 2018 16:01:09 +0200
Subject: [REF] *: BS4, remove the use of btn-sm

Odoo made the bad choice of using the 'btn-sm' class for every button
instead of configuring the padding for default 'btn' to be smaller.
In BS4, the style of btn-sm is actually more complex, lowering the
font-size too. Also, btn-xs was removed so we would not have the
possibility to display smaller button than our default ones.

This commit removes btn-sm wherever it was used. Unfortunately, this
might remove it at some places where it made sense but this can be
restored in a second time.
---
 addons/base_import/static/src/xml/base_import.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'addons/base_import/static/src/xml/base_import.xml')

diff --git a/addons/base_import/static/src/xml/base_import.xml b/addons/base_import/static/src/xml/base_import.xml
index 95b54b5a5af..d84800eca01 100644
--- a/addons/base_import/static/src/xml/base_import.xml
+++ b/addons/base_import/static/src/xml/base_import.xml
@@ -93,11 +93,11 @@
     </t>
 
     <t t-name="ImportView.buttons">
-        <button type="button" class="btn btn-sm btn-primary o_import_import d-none">Import</button>
-        <button type="button" class="btn btn-sm btn-default o_import_validate d-none">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 d-none">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-default 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-default o_import_file_reload d-none">Reload File</button>
+        <button type="button" class="btn btn-default 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-default o_button_import">
             Import
         </button>
     </t>
-- 
cgit v1.2.3


From c59380bac5bbd47bc7dcd92b38049af29a62c3d1 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Mon, 16 Jul 2018 16:48:59 +0200
Subject: [REF] *: BS4, rename btn-default to btn-secondary

BS4 "btn-default" class was replaced with "btn-secondary", which makes
more sense.
---
 addons/base_import/static/src/xml/base_import.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/base_import/static/src/xml/base_import.xml')

diff --git a/addons/base_import/static/src/xml/base_import.xml b/addons/base_import/static/src/xml/base_import.xml
index d84800eca01..da83361db0f 100644
--- a/addons/base_import/static/src/xml/base_import.xml
+++ b/addons/base_import/static/src/xml/base_import.xml
@@ -94,10 +94,10 @@
 
     <t t-name="ImportView.buttons">
         <button type="button" class="btn btn-primary o_import_import d-none">Import</button>
-        <button type="button" class="btn btn-default o_import_validate d-none">Test 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-default o_import_file_reload d-none">Reload File</button>
-        <button type="button" class="btn btn-default o_import_cancel">Cancel</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-default o_button_import">
+        <button t-if='widget and widget.importEnabled' type="button" class="btn btn-secondary o_button_import">
             Import
         </button>
     </t>
-- 
cgit v1.2.3


From ed1b18f10348244ce26b8b27edbd59d91cee7772 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Wed, 16 May 2018 12:24:30 +0200
Subject: [REF] *: BS4, adapt col-related classes

col-lg-* -> col-xl-*
col-md-* -> col-lg-*
col-sm-* -> col-md-*
col-xs-* -> col-*

col-lg-offset-* -> offset-xl-*
col-md-offset-* -> offset-lg-*
col-sm-offset-* -> offset-md-*
col-xs-offset-* -> offset-*

col-lg-pull-* -> order-xl-1
col-md-pull-* -> order-lg-1
col-sm-pull-* -> order-md-1
col-xs-pull-* -> order-1

col-lg-push-* -> order-xl-2
col-md-push-* -> order-lg-2
col-sm-push-* -> order-md-2
col-xs-push-* -> order-2
---
 addons/base_import/static/src/xml/base_import.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/base_import/static/src/xml/base_import.xml')

diff --git a/addons/base_import/static/src/xml/base_import.xml b/addons/base_import/static/src/xml/base_import.xml
index da83361db0f..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 d-none">
+            <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 d-none">
+            <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
-- 
cgit v1.2.3