[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

4 files changed, 24 insertions, 25 deletions

diff --git a/addons/web_tour/static/src/js/tour_manager.js b/addons/web_tour/static/src/js/tour_manager.js
index 895844f050e..9e4046c389e 100644
--- a/addons/web_tour/static/src/js/tour_manager.js
+++ b/addons/web_tour/static/src/js/tour_manager.js
@@ -361,7 +361,10 @@ return core.Class.extend(mixins.EventDispatcherMixin, ServicesMixin, {
             position: "bottom",
             auto: true,
             run: function (actions) {
-                actions.auto("#more_menu_button");
+                var $more = $('.o_extra_menu_items > .dropdown-toggle');
+                if ($more.length) {
+                    actions.auto($more);
+                }
             },
         },
 
diff --git a/addons/web_tour/static/src/scss/keyframes.scss b/addons/web_tour/static/src/scss/keyframes.scss
index 71b390211f0..0e7bb598fb2 100644
--- a/addons/web_tour/static/src/scss/keyframes.scss
+++ b/addons/web_tour/static/src/scss/keyframes.scss
@@ -1,49 +1,49 @@
 @-webkit-keyframes move-left-right {
     0% {
-        @include translate(-3px, 0);
+        transform: translate(-3px, 0);
     }
     100% {
-        @include translate(3px, 0);
+        transform: translate(3px, 0);
     }
 }
 @-moz-keyframes move-left-right {
     0% {
-        @include translate(-3px, 0);
+        transform: translate(-3px, 0);
     }
     100% {
-        @include translate(3px, 0);
+        transform: translate(3px, 0);
     }
 }
 @keyframes move-left-right {
     0% {
-        @include translate(-3px, 0);
+        transform: translate(-3px, 0);
     }
     100% {
-        @include translate(3px, 0);
+        transform: translate(3px, 0);
     }
 }
 
 @-webkit-keyframes move-bottom-top {
     0% {
-        @include translate(0, -3px);
+        transform: translate(0, -3px);
     }
     100% {
-        @include translate(0, 3px);
+        transform: translate(0, 3px);
     }
 }
 @-moz-keyframes move-bottom-top {
     0% {
-        @include translate(0px, -3px);
+        transform: translate(0px, -3px);
     }
     100% {
-        @include translate(0, 3px);
+        transform: translate(0, 3px);
     }
 }
 @keyframes move-bottom-top {
     0% {
-        @include translate(0px, -3px);
+        transform: translate(0px, -3px);
     }
     100% {
-        @include translate(0, 3px);
+        transform: translate(0, 3px);
     }
 }
diff --git a/addons/web_tour/static/src/scss/tip.scss b/addons/web_tour/static/src/scss/tip.scss
index 2cb72fcd9f8..bb11d516c01 100644
--- a/addons/web_tour/static/src/scss/tip.scss
+++ b/addons/web_tour/static/src/scss/tip.scss
@@ -26,7 +26,7 @@
 }
 
 .o_tooltip {
-    $o-tip-color: $o-brand-primary;
+    $o-tip-color: $o-brand-odoo;
     $o-tip-size: 24px;
     $o-tip-border-width: 2px;
     $o-tip-arrow-length: 10px;
@@ -72,9 +72,9 @@
         border-radius $o-tip-border-radius-duration-out ease $o-tip-border-radius-delay-out;
 
     &.o_animated {
-        @include o-animation(move-bottom-top, 500ms, ease-in, 0ms, infinite, alternate);
+        animation: move-bottom-top 500ms ease-in 0ms infinite alternate;
         &.right, &.left {
-            @include animation-name(move-left-right);
+            animation-name: move-left-right;
         }
     }
 
diff --git a/addons/web_tour/static/src/xml/debug_manager.xml b/addons/web_tour/static/src/xml/debug_manager.xml
index 11c259e9944..caaa589650c 100644
--- a/addons/web_tour/static/src/xml/debug_manager.xml
+++ b/addons/web_tour/static/src/xml/debug_manager.xml
@@ -2,21 +2,17 @@
 <templates id="template" xml:space="preserve">
 
 <t t-extend="WebClient.DebugManager.Global">
-    <t t-jquery="li > a[data-action='select_view']" t-operation="after">
+    <t t-jquery="a[data-action='select_view']" t-operation="after">
         <t t-if="manager._is_admin">
-            <li t-if="manager.consume_tours_enabled">
-                <a href="#" data-action="consume_tours">Disable Tours</a>
-            </li>
-            <li>
-                <a href="#" data-action="start_tour">Start Tour</a>
-            </li>
+            <a t-if="manager.consume_tours_enabled" href="#" class="dropdown-item" data-action="consume_tours">Disable Tours</a>
+            <a href="#" class="dropdown-item" data-action="start_tour">Start Tour</a>
         </t>
     </t>
 </t>
 
 <t t-name="WebClient.DebugManager.ToursDialog">
     <div>
-        <table class="table table-condensed table-striped table-responsive">
+        <table class="table table-sm table-striped table-responsive">
             <tr>
                 <th>Name</th>
                 <th>Path</th>
@@ -26,7 +22,7 @@
             <tr t-foreach="tours" t-as="tour">
                 <td><t t-esc="tour"/></td>
                 <td><t t-esc="tours[tour].url"/></td>
-                <td><button type="button" class="btn btn-sm btn-primary fa fa-play o_start_tour" t-att-data-name="tour" aria-label="Tour" title="Tour"/></td>
+                <td><button type="button" class="btn btn-primary fa fa-play o_start_tour" t-att-data-name="tour" aria-label="Tour" title="Tour"/></td>
             </tr>
         </table>
     </div>