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/website/static/src/xml/website.backend.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/xml/website.backend.xml')

diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml
index a5e14c2c0bc..e01d53482b6 100644
--- a/addons/website/static/src/xml/website.backend.xml
+++ b/addons/website/static/src/xml/website.backend.xml
@@ -61,8 +61,8 @@
     </div>
 
     <t t-name="website.DateRangeButtons">
-        <!-- TODO: Applied hidden-xs class as it is going to push in control panel and it breaks UI, maybe we will improve it in future -->
-        <div class="btn-group btn-group-sm o_date_range_buttons hidden-xs pull-right">
+        <!-- TODO: Hide in mobile as it is going to push in control panel and it breaks UI, maybe we will improve it in future -->
+        <div class="btn-group btn-group-sm o_date_range_buttons d-none d-md-inline-flex pull-right">
             <button class="btn btn-sm btn-default js_date_range active" data-date="week">Last Week</button>
             <button class="btn btn-sm btn-default js_date_range" data-date="month">Last Month</button>
             <button class="btn btn-sm btn-default js_date_range" data-date="year">Last Year</button>
-- 
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/website/static/src/xml/website.backend.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/website/static/src/xml/website.backend.xml')

diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml
index e01d53482b6..1bf996f7cef 100644
--- a/addons/website/static/src/xml/website.backend.xml
+++ b/addons/website/static/src/xml/website.backend.xml
@@ -33,7 +33,7 @@
                             </div>
                             <div class="o_buttons text-center">
                                 <h3>There is no data currently available.</h3>
-                                <button class="btn btn-sm btn-primary js_link_analytics_settings center-block mb8">Link my Analytics Account</button>
+                                <button class="btn btn-primary js_link_analytics_settings center-block mb8">Link my Analytics Account</button>
                             </div>
                         </div>
                     </div>
@@ -62,10 +62,10 @@
 
     <t t-name="website.DateRangeButtons">
         <!-- TODO: Hide in mobile as it is going to push in control panel and it breaks UI, maybe we will improve it in future -->
-        <div class="btn-group btn-group-sm o_date_range_buttons d-none d-md-inline-flex pull-right">
-            <button class="btn btn-sm btn-default js_date_range active" data-date="week">Last Week</button>
-            <button class="btn btn-sm btn-default js_date_range" data-date="month">Last Month</button>
-            <button class="btn btn-sm btn-default js_date_range" data-date="year">Last Year</button>
+        <div class="btn-group o_date_range_buttons d-none d-md-inline-flex pull-right">
+            <button class="btn btn-default js_date_range active" data-date="week">Last Week</button>
+            <button class="btn btn-default js_date_range" data-date="month">Last Month</button>
+            <button class="btn btn-default js_date_range" data-date="year">Last Year</button>
         </div>
     </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/website/static/src/xml/website.backend.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/website/static/src/xml/website.backend.xml')

diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml
index 1bf996f7cef..e5a07ad6139 100644
--- a/addons/website/static/src/xml/website.backend.xml
+++ b/addons/website/static/src/xml/website.backend.xml
@@ -63,9 +63,9 @@
     <t t-name="website.DateRangeButtons">
         <!-- TODO: Hide in mobile as it is going to push in control panel and it breaks UI, maybe we will improve it in future -->
         <div class="btn-group o_date_range_buttons d-none d-md-inline-flex pull-right">
-            <button class="btn btn-default js_date_range active" data-date="week">Last Week</button>
-            <button class="btn btn-default js_date_range" data-date="month">Last Month</button>
-            <button class="btn btn-default js_date_range" data-date="year">Last Year</button>
+            <button class="btn btn-secondary js_date_range active" data-date="week">Last Week</button>
+            <button class="btn btn-secondary js_date_range" data-date="month">Last Month</button>
+            <button class="btn btn-secondary js_date_range" data-date="year">Last Year</button>
         </div>
     </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/website/static/src/xml/website.backend.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/website/static/src/xml/website.backend.xml')

diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml
index e5a07ad6139..cf53351c256 100644
--- a/addons/website/static/src/xml/website.backend.xml
+++ b/addons/website/static/src/xml/website.backend.xml
@@ -21,13 +21,13 @@
     <t t-name="website.dashboard_content">
         <div class="o_website_dashboard_content">
             <div class="row o_dashboard_visits" t-if="widget.groups.website_designer">
-                <div class="col-xs-12 o_box">
+                <div class="col-12 o_box">
                     <h2>Visits</h2>
                     <div t-if="widget.dashboards_data.visits &amp;&amp; widget.dashboards_data.visits.ga_client_id">
                         <div class="row js_analytics_components"/>
                         <a href="#" class="js_link_analytics_settings">Edit my Analytics Client ID</a>
                     </div>
-                    <div t-if="!(widget.dashboards_data.visits &amp;&amp; widget.dashboards_data.visits.ga_client_id)" class="col-md-12">
+                    <div t-if="!(widget.dashboards_data.visits &amp;&amp; widget.dashboards_data.visits.ga_client_id)" class="col-lg-12">
                         <div class="o_demo_background">
                             <div class="o_layer">
                             </div>
@@ -42,7 +42,7 @@
         </div>
     </t>
 
-    <div t-name="website.unauthorized_analytics" class="col-xs-12 js_unauthorized_message mb16">
+    <div t-name="website.unauthorized_analytics" class="col-12 js_unauthorized_message mb16">
         <span t-if="reason === 'not_connected'">You need to log in to your Google Account before: </span>
         <span t-if="reason === 'no_right'">You do not seem to have access to this Analytics Account.</span>
         <span t-if="reason === 'not_initialized'">Google Analytics initialization failed. Maybe this domain is not whitelisted in your Google Analytics project for this client ID.</span>
-- 
cgit v1.2.3


From d48b8593dde7c6adf679359e2dd64dee288e9544 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Fri, 25 May 2018 17:00:00 +0200
Subject: [REF] *: BS4, 'pull-left/right' -> 'float-left/right'

---
 addons/website/static/src/xml/website.backend.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/xml/website.backend.xml')

diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml
index cf53351c256..11afcaacd52 100644
--- a/addons/website/static/src/xml/website.backend.xml
+++ b/addons/website/static/src/xml/website.backend.xml
@@ -62,7 +62,7 @@
 
     <t t-name="website.DateRangeButtons">
         <!-- TODO: Hide in mobile as it is going to push in control panel and it breaks UI, maybe we will improve it in future -->
-        <div class="btn-group o_date_range_buttons d-none d-md-inline-flex pull-right">
+        <div class="btn-group o_date_range_buttons d-none d-md-inline-flex float-right">
             <button class="btn btn-secondary js_date_range active" data-date="week">Last Week</button>
             <button class="btn btn-secondary js_date_range" data-date="month">Last Month</button>
             <button class="btn btn-secondary js_date_range" data-date="year">Last Year</button>
-- 
cgit v1.2.3


From f7cee83cb890b5f4fea7c1c2399082df2bd3fb66 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Fri, 25 May 2018 17:06:27 +0200
Subject: [REF] *: BS4, 'center-block' -> 'd-block mx-auto'

---
 addons/website/static/src/xml/website.backend.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/xml/website.backend.xml')

diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml
index 11afcaacd52..b61d4503e95 100644
--- a/addons/website/static/src/xml/website.backend.xml
+++ b/addons/website/static/src/xml/website.backend.xml
@@ -33,7 +33,7 @@
                             </div>
                             <div class="o_buttons text-center">
                                 <h3>There is no data currently available.</h3>
-                                <button class="btn btn-primary js_link_analytics_settings center-block mb8">Link my Analytics Account</button>
+                                <button class="btn btn-primary js_link_analytics_settings d-block mx-auto mb8">Link my Analytics Account</button>
                             </div>
                         </div>
                     </div>
-- 
cgit v1.2.3