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/mail/static/src/xml/activity.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/mail/static/src/xml/activity.xml')

diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml
index ca07f810101..1ca80f46fcd 100644
--- a/addons/mail/static/src/xml/activity.xml
+++ b/addons/mail/static/src/xml/activity.xml
@@ -62,13 +62,13 @@
                             <t t-raw="activity.note"/>
                         </div>
                         <div class="o_thread_message_tools btn-group">
-                            <a role="button" href="#" class="btn btn-link btn-success text-muted btn-sm o_activity_done o_activity_link mr8" t-att-data-activity-id="activity.id" t-att-data-previous-activity-type-id="activity.activity_type_id[0]" data-toggle="popover">
+                            <a role="button" href="#" class="btn btn-link btn-success text-muted o_activity_done o_activity_link mr8" t-att-data-activity-id="activity.id" t-att-data-previous-activity-type-id="activity.activity_type_id[0]" data-toggle="popover">
                                 <i class="fa fa-check"/> Mark Done
                             </a>
-                            <a role="button" href="#" class="btn btn-link btn-default text-muted btn-sm o_activity_edit o_activity_link" t-att-data-activity-id="activity.id">
+                            <a role="button" href="#" class="btn btn-link btn-default text-muted o_activity_edit o_activity_link" t-att-data-activity-id="activity.id">
                                 <i class="fa fa-pencil"/> Edit
                             </a>
-                            <a role="button" href="#" class="btn btn-link btn-sm btn-danger text-muted o_activity_unlink o_activity_link" t-att-data-activity-id="activity.id">
+                            <a role="button" href="#" class="btn btn-link btn-danger text-muted o_activity_unlink o_activity_link" t-att-data-activity-id="activity.id">
                                 <i class="fa fa-times"/> Cancel
                             </a>
                         </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/mail/static/src/xml/activity.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/mail/static/src/xml/activity.xml')

diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml
index 1ca80f46fcd..abad7e51a4f 100644
--- a/addons/mail/static/src/xml/activity.xml
+++ b/addons/mail/static/src/xml/activity.xml
@@ -65,7 +65,7 @@
                             <a role="button" href="#" class="btn btn-link btn-success text-muted o_activity_done o_activity_link mr8" t-att-data-activity-id="activity.id" t-att-data-previous-activity-type-id="activity.activity_type_id[0]" data-toggle="popover">
                                 <i class="fa fa-check"/> Mark Done
                             </a>
-                            <a role="button" href="#" class="btn btn-link btn-default text-muted o_activity_edit o_activity_link" t-att-data-activity-id="activity.id">
+                            <a role="button" href="#" class="btn btn-link btn-secondary text-muted o_activity_edit o_activity_link" t-att-data-activity-id="activity.id">
                                 <i class="fa fa-pencil"/> Edit
                             </a>
                             <a role="button" href="#" class="btn btn-link btn-danger text-muted o_activity_unlink o_activity_link" t-att-data-activity-id="activity.id">
-- 
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/mail/static/src/xml/activity.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/mail/static/src/xml/activity.xml')

diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml
index abad7e51a4f..cbb2b222c90 100644
--- a/addons/mail/static/src/xml/activity.xml
+++ b/addons/mail/static/src/xml/activity.xml
@@ -33,7 +33,7 @@
                                 <i class="fa fa-info-circle" role="img" aria-label="Info" title="Info"></i>
                             </a>
                             <div class="o_thread_message_collapse collapse" t-attf-id="o_chatter_activity_info_#{activity.id}">
-                                <dl class="dl-horizontal well">
+                                <dl class="dl-horizontal">
                                     <dt>Activity type</dt>
                                     <dd class="mb8">
                                         <t t-esc="activity.activity_type_id[1]"/>
-- 
cgit v1.2.3


From 443735949e799bcb362f87a6072c4baf46088022 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Tue, 22 May 2018 13:17:47 +0200
Subject: [REF] *: BS4, replace img-rounded/img-circle classes

'img-rounded' -> 'rounded'
'img-circle' -> 'rounded-circle'
---
 addons/mail/static/src/xml/activity.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'addons/mail/static/src/xml/activity.xml')

diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml
index cbb2b222c90..93732a20505 100644
--- a/addons/mail/static/src/xml/activity.xml
+++ b/addons/mail/static/src/xml/activity.xml
@@ -6,9 +6,9 @@
                 <i class="fa fa-fw fa-caret-down"/>
                 Planned activities
                 <small class="o_chatter_planned_activities_summary ml8">
-                    <span class="label img-circle label-danger"><t t-esc="nbOverdueActivities"/></span>
-                    <span class="label img-circle label-warning"><t t-esc="nbTodayActivities"/></span>
-                    <span class="label img-circle label-success"><t t-esc="nbPlannedActivities"/></span>
+                    <span class="label rounded-circle label-danger"><t t-esc="nbOverdueActivities"/></span>
+                    <span class="label rounded-circle label-warning"><t t-esc="nbTodayActivities"/></span>
+                    <span class="label rounded-circle label-success"><t t-esc="nbPlannedActivities"/></span>
                 </small>
             </a>
         </div>
@@ -17,7 +17,7 @@
                 <div class="o_thread_message" style="margin-bottom: 10px">
                     <div class="o_thread_message_sidebar">
                         <div class="o_avatar_stack">
-                            <img t-attf-src="/web/image#{activity.user_id[0] >= 0 ? ('/res.users/' + activity.user_id[0] + '/image_small') : ''}" class="o_thread_message_avatar img-circle mb8" t-att-title="activity.user_id[1]" t-att-alt="activity.user_id[1]"/>
+                            <img t-attf-src="/web/image#{activity.user_id[0] >= 0 ? ('/res.users/' + activity.user_id[0] + '/image_small') : ''}" class="o_thread_message_avatar rounded-circle mb8" t-att-title="activity.user_id[1]" t-att-alt="activity.user_id[1]"/>
                             <i t-att-class="'o_avatar_icon fa ' + activity.icon + ' bg-' + (activity.state == 'planned'? 'success' : (activity.state == 'today'? 'warning' : 'danger')) + '-full'"
                                t-att-title="activity.activity_type_id[1]"/>
                         </div>
@@ -44,14 +44,14 @@
                                         by
                                         <img t-attf-src="/web/image#{activity.create_user_id[0] >= 0 ? ('/res.users/' + activity.create_user_id[0] + '/image_small') : ''}"
                                             height="18" width="18"
-                                            class="img-circle mr4"
+                                            class="rounded-circle mr4"
                                             t-att-title="activity.create_user_id[1]"
                                             t-att-alt="activity.create_user_id[1]"/>
                                         <b><t t-esc="activity.create_user_id[1]"/></b>
                                     </dd>
                                     <dt>Assigned to</dt>
                                     <dd class="mb8">
-                                        <img t-attf-src="/web/image#{activity.user_id[0] >= 0 ? ('/res.users/' + activity.user_id[0] + '/image_small') : ''}" height="18" width="18" class="img-circle mr4" t-att-title="activity.user_id[1]" t-att-alt="activity.user_id[1]"/>
+                                        <img t-attf-src="/web/image#{activity.user_id[0] >= 0 ? ('/res.users/' + activity.user_id[0] + '/image_small') : ''}" height="18" width="18" class="rounded-circle mr4" t-att-title="activity.user_id[1]" t-att-alt="activity.user_id[1]"/>
                                         <b><t t-esc="activity.user_id[1]"/></b>
                                         <em>, due on </em><span t-attf-class="o_activity_color_#{activity.state}"><t t-esc="activity.date_deadline.format(dateFormat)"/></span>
                                     </dd>
-- 
cgit v1.2.3


From ee65b44d9e51f380e1b6978485e466b5720df215 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Fri, 25 May 2018 17:43:04 +0200
Subject: [REF] *: BS4, adapt the label component structure

The '.label' elements have been replaced by '.badge' elements without
the 'badge-pill' class.
---
 addons/mail/static/src/xml/activity.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/mail/static/src/xml/activity.xml')

diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml
index 93732a20505..ef6eb31a593 100644
--- a/addons/mail/static/src/xml/activity.xml
+++ b/addons/mail/static/src/xml/activity.xml
@@ -6,9 +6,9 @@
                 <i class="fa fa-fw fa-caret-down"/>
                 Planned activities
                 <small class="o_chatter_planned_activities_summary ml8">
-                    <span class="label rounded-circle label-danger"><t t-esc="nbOverdueActivities"/></span>
-                    <span class="label rounded-circle label-warning"><t t-esc="nbTodayActivities"/></span>
-                    <span class="label rounded-circle label-success"><t t-esc="nbPlannedActivities"/></span>
+                    <span class="badge rounded-circle badge-danger"><t t-esc="nbOverdueActivities"/></span>
+                    <span class="badge rounded-circle badge-warning"><t t-esc="nbTodayActivities"/></span>
+                    <span class="badge rounded-circle badge-success"><t t-esc="nbPlannedActivities"/></span>
                 </small>
             </a>
         </div>
-- 
cgit v1.2.3


From 582933ac016c31cb7c4c00882e61ad2c4d93e333 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Tue, 29 May 2018 14:07:45 +0200
Subject: [REF] *: BS4, replace 'btn-xs' by 'btn-sm'

In a previous commit, we removed the use of the 'btn-sm' classes as we
used it everywhere for default-size buttons instead of customizing the
size of those default-size buttons directly.

This commit proves it was even more necessary as the 'btn-xs' class does
not exist anymore in BS4 and we so can use the 'btn-sm' class instead.
---
 addons/mail/static/src/xml/activity.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/mail/static/src/xml/activity.xml')

diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml
index ef6eb31a593..b467f19576f 100644
--- a/addons/mail/static/src/xml/activity.xml
+++ b/addons/mail/static/src/xml/activity.xml
@@ -81,11 +81,11 @@
         <div>
             <textarea class="form-control" rows="3" id="activity_feedback" placeholder="Write Feedback"/>
             <div class="mt8">
-                <button type="button" class="btn btn-xs btn-primary o_activity_popover_done_next" t-att-data-previous-activity-type-id="previous_activity_type_id">
+                <button type="button" class="btn btn-sm btn-primary o_activity_popover_done_next" t-att-data-previous-activity-type-id="previous_activity_type_id">
                     Done &amp; Schedule Next</button>
-                <button type="button" class="btn btn-xs btn-primary o_activity_popover_done">
+                <button type="button" class="btn btn-sm btn-primary o_activity_popover_done">
                     Done</button>
-                <button type="button" class="btn btn-xs btn-link o_activity_popover_discard">
+                <button type="button" class="btn btn-sm btn-link o_activity_popover_discard">
                     Discard</button>
             </div>
         </div>
-- 
cgit v1.2.3