[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

5 files changed, 20 insertions, 20 deletions

diff --git a/addons/note/static/description/index.html b/addons/note/static/description/index.html
index 31e54f4d1b9..d3cdcafd034 100644
--- a/addons/note/static/description/index.html
+++ b/addons/note/static/description/index.html
@@ -91,7 +91,7 @@
     <div class="oe_row oe_spaced">
         <h2 class="oe_slogan oe_mb32" style="color:#875A7B;">Integrate Odoo Notes into your workflow</h2>
         <div class="oe_span4">
-            <span class="fa fa-lightbulb-o fa-2x pull-left"/>
+            <span class="fa fa-lightbulb-o fa-2x float-left"/>
             <h3>
                 <b>Are you a creative?</b>
             </h3>
@@ -105,7 +105,7 @@
             </div>
         </div>
         <div class="oe_span4">
-            <span class="fa fa-plane fa-2x pull-left"/>
+            <span class="fa fa-plane fa-2x float-left"/>
             <h3>
                 <b>Are you a frequent traveler?</b>
             </h3>
@@ -120,7 +120,7 @@
             </div>
         </div>
         <div class="oe_span4">
-            <span class="fa fa-suitcase fa-2x pull-left"/>
+            <span class="fa fa-suitcase fa-2x float-left"/>
             <h3>
                 <b>Are you a manager?</b>
             </h3>
diff --git a/addons/note/static/src/js/systray_activity_menu.js b/addons/note/static/src/js/systray_activity_menu.js
index 8194cc17e6a..f65dfce244f 100644
--- a/addons/note/static/src/js/systray_activity_menu.js
+++ b/addons/note/static/src/js/systray_activity_menu.js
@@ -48,8 +48,8 @@ ActivityMenu.include({
         if (noteDateTime) {
             params = _.extend(params, {'date_deadline': noteDateTime});
         }
-        this.$('.o_note_show').removeClass('hidden');
-        this.$('.o_note').addClass('hidden');
+        this.$('.o_note_show').removeClass('d-none');
+        this.$('.o_note').addClass('d-none');
         this._rpc({
             route: '/note/new',
             params: params,
@@ -91,7 +91,7 @@ ActivityMenu.include({
         }
         this.noteDateTimeWidget.appendTo(this.$('.o_note_datetime'));
         this.noteDateTimeWidget.$input.attr('placeholder', _t("Today"));
-        this.$('.o_note_show, .o_note').toggleClass('hidden');
+        this.$('.o_note_show, .o_note').toggleClass('d-none');
         this.$('.o_note_input').val('').focus();
     },
     /**
diff --git a/addons/note/static/src/scss/note.scss b/addons/note/static/src/scss/note.scss
index f1e90d80d57..a1d4227e182 100644
--- a/addons/note/static/src/scss/note.scss
+++ b/addons/note/static/src/scss/note.scss
@@ -8,7 +8,7 @@
         margin-bottom: 0;
     }
     .oe_form_field.oe_memo {
-        margin: 0 ($padding-large-horizontal * -1);
+        margin: 0 ($input-btn-padding-x-lg * -1);
         padding: 0;
         min-height: 200px;
 
@@ -18,8 +18,8 @@
     }
     &.o_form_readonly {
         .oe_memo {
-            padding: $padding-large-horizontal;
-            border-bottom: 1px solid $legend-border-color;
+            padding: $input-btn-padding-x-lg;
+            border-bottom: 1px solid gray('900');
         }
     }
 }
@@ -30,13 +30,13 @@
     .o_preview_info {
         .o_preview_title {
             .o_preview_name {
-                @include o-flex(1, 1, 100%);
+                flex: 1 1 100%;
             }
         }
         .o_note_input_box {
-            @include o-flex-display;
+            display: flex;
             p {
-                @include o-flex(1, 1, auto);
+                flex: 1 1 auto;
             }
         }
         .o_note_save {
diff --git a/addons/note/static/src/xml/systray.xml b/addons/note/static/src/xml/systray.xml
index d1676c63761..56693a14544 100644
--- a/addons/note/static/src/xml/systray.xml
+++ b/addons/note/static/src/xml/systray.xml
@@ -5,7 +5,7 @@
             <div class="o_note_show">
                 <a role="button" class="btn btn-block text-center">Add new note</a>
             </div>
-            <div class="o_note o_mail_preview hidden">
+            <div class="o_note o_mail_preview d-none">
                 <div class="o_mail_preview_image o_mail_preview_app">
                     <img src="/note/static/description/icon.png" alt="Channel"/>
                 </div>
diff --git a/addons/note/static/tests/systray_activity_menu_tests.js b/addons/note/static/tests/systray_activity_menu_tests.js
index adf6fcd9bf5..5260cd3a685 100644
--- a/addons/note/static/tests/systray_activity_menu_tests.js
+++ b/addons/note/static/tests/systray_activity_menu_tests.js
@@ -40,24 +40,24 @@ QUnit.test('note activity menu widget: create note from activity menu', function
 
     // toggle quick create for note
     activityMenu.$('.dropdown-toggle').click();
-    assert.strictEqual(activityMenu.$('.o_note_show').hasClass("hidden"), false, 'ActivityMenu should have Add new note CTA');
+    assert.strictEqual(activityMenu.$('.o_note_show').hasClass('d-none'), false, 'ActivityMenu should have Add new note CTA');
     activityMenu.$('.o_note_show').click();
-    assert.strictEqual(activityMenu.$('.o_note_show').hasClass("hidden"), true, 'ActivityMenu should hide CTA when entering a new note');
-    assert.strictEqual(activityMenu.$('.o_note').hasClass("hidden"), false, 'ActivityMenu should display input for new note');
+    assert.strictEqual(activityMenu.$('.o_note_show').hasClass('d-none'), true, 'ActivityMenu should hide CTA when entering a new note');
+    assert.strictEqual(activityMenu.$('.o_note').hasClass('d-none'), false, 'ActivityMenu should display input for new note');
 
     // creating quick note without date
     activityMenu.$("input.o_note_input").val("New Note");
     activityMenu.$(".o_note_save").click();
-    assert.strictEqual(activityMenu.$('.o_note_show').hasClass("hidden"), false, 'ActivityMenu add note button should be displayed');
-    assert.strictEqual(activityMenu.$('.o_note').hasClass("hidden"), true, 'ActivityMenu add note input should be hidden');
+    assert.strictEqual(activityMenu.$('.o_note_show').hasClass('d-none'), false, 'ActivityMenu add note button should be displayed');
+    assert.strictEqual(activityMenu.$('.o_note').hasClass('d-none'), true, 'ActivityMenu add note input should be hidden');
 
     // creating quick note with date
     activityMenu.$('.o_note_show').click();
     activityMenu.$('input.o_note_input').val("New Note");
     activityMenu.$('.o_note_set_datetime').click();
     activityMenu.$(".o_note_save").click();
-    assert.strictEqual(activityMenu.$('.o_note_show').hasClass("hidden"), false, 'ActivityMenu add note button should be displayed');
-    assert.strictEqual(activityMenu.$('.o_note').hasClass("hidden"), true, 'ActivityMenu add note input should be hidden');
+    assert.strictEqual(activityMenu.$('.o_note_show').hasClass('d-none'), false, 'ActivityMenu add note button should be displayed');
+    assert.strictEqual(activityMenu.$('.o_note').hasClass('d-none'), true, 'ActivityMenu add note input should be hidden');
     activityMenu.destroy();
 });
 });