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

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

diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index bdd5aa42941..7bded7ce4e6 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -23,8 +23,8 @@
                         </form>
                     </main>
                     <footer class="modal-footer">
-                        <button type="button" class="btn btn-sm btn-primary btn-continue">Continue</button>
-                        <button type="button" class="btn btn-sm btn-default" data-dismiss="modal" aria-label="Cancel">Cancel</button>
+                        <button type="button" class="btn btn-primary btn-continue">Continue</button>
+                        <button type="button" class="btn btn-default" data-dismiss="modal" aria-label="Cancel">Cancel</button>
                     </footer>
                 </div>
             </div>
-- 
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.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 7bded7ce4e6..300badf2511 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -24,7 +24,7 @@
                     </main>
                     <footer class="modal-footer">
                         <button type="button" class="btn btn-primary btn-continue">Continue</button>
-                        <button type="button" class="btn btn-default" data-dismiss="modal" aria-label="Cancel">Cancel</button>
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal" aria-label="Cancel">Cancel</button>
                     </footer>
                 </div>
             </div>
-- 
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.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 300badf2511..ca97d0a6eb1 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -11,10 +11,10 @@
                     <main class="modal-body">
                         <form class="form-horizontal" role="form" t-att-id="id">
                             <div class="form-group mb0">
-                                <label for="page-name" class="col-sm-3 control-label">
+                                <label for="page-name" class="col-md-3 control-label">
                                     <t t-esc="field_name"/>:
                                 </label>
-                                <div class="col-sm-8">
+                                <div class="col-md-8">
                                     <input t-if="field_type == 'input'" type="text" class="form-control" required="required"/>
                                     <textarea t-if="field_type == 'textarea'" class="form-control" required="required" rows="5"></textarea>
                                     <select t-if="field_type == 'select'" class="form-control"></select>
@@ -65,8 +65,8 @@
         <div class="well">
             <form class="form-horizontal">
                 <div class="form-group mb0">
-                    <label for="new_name" class="control-label col-sm-4">Rename Page To:</label>
-                    <div class="col-sm-8">
+                    <label for="new_name" class="control-label col-md-4">Rename Page To:</label>
+                    <div class="col-md-8">
                         <input type="text" class="form-control" id="new_name" placeholder="e.g. About Us"/>
                     </div>
                 </div>
-- 
cgit v1.2.3


From 59237ea81988bdcd0cc746422a7c94bf2eadaaa2 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 15 Mar 2018 14:25:57 +0100
Subject: [REF] *: BS4, review panel and well structure

Panels and wells were dropped and replaced by the "Card" component.
---
 addons/website/static/src/xml/website.xml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index ca97d0a6eb1..72036f9217b 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -62,15 +62,17 @@
     </div>
 
     <div t-name="website.rename_page">
-        <div class="well">
-            <form class="form-horizontal">
-                <div class="form-group mb0">
-                    <label for="new_name" class="control-label col-md-4">Rename Page To:</label>
-                    <div class="col-md-8">
-                        <input type="text" class="form-control" id="new_name" placeholder="e.g. About Us"/>
+        <div class="card">
+            <div class="card-body">
+                <form class="form-horizontal">
+                    <div class="form-group mb0">
+                        <label for="new_name" class="control-label col-md-4">Rename Page To:</label>
+                        <div class="col-md-8">
+                            <input type="text" class="form-control" id="new_name" placeholder="e.g. About Us"/>
+                        </div>
                     </div>
-                </div>
-            </form>
+                </form>
+            </div>
         </div>
         <t t-call="website.dependencies"/>
     </div>
-- 
cgit v1.2.3


From 93b0001df6766fe905ee69c25ec8d846e4551064 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Tue, 22 May 2018 15:30:36 +0200
Subject: [REF] *: BS4, adapt forms

The 'form-horizontal' class have been removed; the '.form-group'
elements must now use the 'row' class for an horizontal layout.

The 'control-label' class was renamed to 'col-form-label'.

The 'help-block' class was renamed to 'form-text'.

The 'has-error' and 'has-success' classes have been removed and
replaced by a new system using the :valid and :invalid pseudo-classes,
when a parent has the 'was-validated' class. While this system is great,
it is not straightforward to use it in Odoo. Fortunately, BS4 provides
the 'is-valid' and 'is-invalid' classes as fallback. This commit
replaces the 'has-error' and 'has-success' classes by 'o_has_error' and
'o_has_success' classes (for JS compatibility) and use the 'is-*'
fallback classes. (The 'has-warning' class has no equivalent but was
unused in Odoo anyway).
---
 addons/website/static/src/xml/website.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 72036f9217b..e391fcfd5f8 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -9,9 +9,9 @@
                         <h3 class="modal-title"><t t-esc="window_title"/></h3>
                     </header>
                     <main class="modal-body">
-                        <form class="form-horizontal" role="form" t-att-id="id">
-                            <div class="form-group mb0">
-                                <label for="page-name" class="col-md-3 control-label">
+                        <form role="form" t-att-id="id">
+                            <div class="form-group row mb0">
+                                <label for="page-name" class="col-md-3 col-form-label">
                                     <t t-esc="field_name"/>:
                                 </label>
                                 <div class="col-md-8">
@@ -64,9 +64,9 @@
     <div t-name="website.rename_page">
         <div class="card">
             <div class="card-body">
-                <form class="form-horizontal">
-                    <div class="form-group mb0">
-                        <label for="new_name" class="control-label col-md-4">Rename Page To:</label>
+                <form>
+                    <div class="form-group row mb0">
+                        <label for="new_name" class="col-form-label col-md-4">Rename Page To:</label>
                         <div class="col-md-8">
                             <input type="text" class="form-control" id="new_name" placeholder="e.g. About Us"/>
                         </div>
-- 
cgit v1.2.3