[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

2 files changed, 25 insertions, 25 deletions

diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index b8e493c1505..f338a58e51b 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -65,7 +65,7 @@
                       <div class="container">
                           <h1>Contact us</h1>
                           <div class="row">
-                              <div class="col-md-8">
+                              <div class="col-lg-8">
                                   <div class="oe_structure">
                                       <div>
                                           <p>Contact us about anything related to our company or services.</p>
@@ -76,7 +76,7 @@
                                       <a role="button" t-attf-href="mailto:{{ res_company.email }}" class="btn btn-primary" id="o_contact_mail">Send us an email</a>
                                   </div>
                               </div>
-                              <div class="col-md-4 mb32">
+                              <div class="col-lg-4 mb32">
                                   <t t-call="website.company_description"/>
                               </div>
                           </div>
@@ -106,7 +106,7 @@
                                 <section>
                                     <div class="container">
                                         <div class="row">
-                                            <div class="col-md-12">
+                                            <div class="col-lg-12">
                                                 <h1 class="text-center">About us</h1>
                                                 <h3 class="text-muted text-center">Great products for great people</h3>
                                             </div>
@@ -117,7 +117,7 @@
                                 <section>
                                     <div class="container">
                                         <div class="row">
-                                            <div class="col-md-6 mt32">
+                                            <div class="col-lg-6 mt32">
                                                 <p>
                                                       We are a team of passionate people whose goal is to improve everyone's
                                                       life through disruptive products. We build great products to solve your
@@ -128,8 +128,8 @@
                                                       their performance.
                                                 </p>
                                             </div>
-                                            <div class="col-md-4 col-md-offset-2 mt16 mb16">
-                                                <img src="/website/static/src/img/library/business_conference.jpg" class="img img-responsive shadow" alt="Our Team"/>
+                                            <div class="col-lg-4 offset-lg-2 mt16 mb16">
+                                                <img src="/website/static/src/img/library/business_conference.jpg" class="img img-fluid shadow" alt="Our Team"/>
                                             </div>
                                         </div>
                                     </div>
diff --git a/addons/website/data/website_demo.xml b/addons/website/data/website_demo.xml
index 3dce4b0e5f9..40e5168ad1f 100644
--- a/addons/website/data/website_demo.xml
+++ b/addons/website/data/website_demo.xml
@@ -23,7 +23,7 @@
                         <section>
                             <div class="container">
                                 <div class="row">
-                                    <div class="col-md-12">
+                                    <div class="col-lg-12">
                                         <h2>Thank you for posting a message !</h2>
                                     </div>
                                 </div>
@@ -69,7 +69,7 @@ response = request.website.render("website.template_partner_post", {'partner': p
             <section>
                 <div class="container">
                     <div class="row">
-                        <div class="col-md-12">
+                        <div class="col-lg-12">
                             <h1 class="text-center">Send a Message to our Partners</h1>
                             <h3 class="text-muted text-center">Discuss and Comments</h3>
                         </div>
@@ -79,24 +79,24 @@ response = request.website.render("website.template_partner_post", {'partner': p
         </div>
         <div class="container">
             <div class="row">
-                <form class="form-horizontal" action="/website/action/website.action_partner_post" method="post">
+                <form action="/website/action/website.action_partner_post" method="post">
                     <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
-                    <div class="form-group">
-                        <label class="col-sm-2 control-label">Recipient</label>
-                        <div class="col-sm-10">
+                    <div class="form-group row">
+                        <label class="col-md-2 col-form-label">Recipient</label>
+                        <div class="col-md-10">
                             <select t-if="partners" name="partner_id" class="form-control">
                                 <t t-foreach="partners" t-as="partner"><option t-att-value="partner.id" t-esc="partner.name"/></t>
                             </select>
                         </div>
                     </div>
-                    <div class="form-group">
-                        <label class="col-sm-2 control-label">Message</label>
-                        <div class="col-sm-10">
+                    <div class="form-group row">
+                        <label class="col-md-2 col-form-label">Message</label>
+                        <div class="col-md-10">
                             <textarea name="body" rows="10" class="form-control"/>
                         </div>
                     </div>
-                    <div class="form-group">
-                        <div class="col-sm-offset-2 col-sm-10">
+                    <div class="form-group row">
+                        <div class="offset-md-2 col-md-10">
                             <button type="submit" class="btn btn-primary">
                                 Send <span class="fa fa-long-arrow-right"/>
                             </button>
@@ -140,29 +140,29 @@ response = request.render("website.template_partner_comment", {
                   <t t-call="website.layout">
                     <div id="wrap" class="oe_structure oe_empty">
                       <div class="carousel slide mb32" id="myCarousel0" style="height: 320px;">
-                        <ol class="carousel-indicators hidden">
+                        <ol class="carousel-indicators d-none">
                           <li class="active" data-slide-to="0" data-target="#myCarousel0"/>
                         </ol>
                         <div class="carousel-inner">
-                          <div class="item image_text oe_img_bg active" style="background-image: url(http://0.0.0.0:8069/web/image/website.s_background_image_11);">
+                          <div class="carousel-item image_text oe_img_bg active" style="background-image: url(http://0.0.0.0:8069/web/image/website.s_background_image_11);">
                             <div class="container">
                               <div class="row content">
-                                <div class="carousel-content col-md-6 col-sm-12">
+                                <div class="carousel-content col-lg-6 col-md-12">
                                   <h2>Homepage 0.0.0.0</h2>
                                   <h3>Click to customize this text</h3>
                                   <p>
                                     <a role="button" class="btn btn-success btn-large" href="/contactus">Contact us</a>
                                   </p>
                                 </div>
-                                <span class="carousel-img col-md-6 hidden-sm hidden-xs"> </span>
+                                <span class="carousel-img col-lg-6 d-none d-lg-block"> </span>
                               </div>
                             </div>
                           </div>
                         </div>
-                        <div class="carousel-control left hidden" data-slide="prev" data-target="#myCarousel0" href="#myCarousel0" style="width: 10%" role="img" aria-label="Previous" title="Previous">
+                        <div class="carousel-control left d-none" data-slide="prev" data-target="#myCarousel0" href="#myCarousel0" style="width: 10%" role="img" aria-label="Previous" title="Previous">
                           <i class="fa fa-chevron-left"/>
                         </div>
-                        <div class="carousel-control right hidden" data-slide="next" data-target="#myCarousel0" href="#myCarousel0" style="width: 10%" role="img" aria-label="Next" title="Next">
+                        <div class="carousel-control right d-none" data-slide="next" data-target="#myCarousel0" href="#myCarousel0" style="width: 10%" role="img" aria-label="Next" title="Next">
                           <i class="fa fa-chevron-right"/>
                         </div>
                       </div>
@@ -190,7 +190,7 @@ response = request.render("website.template_partner_comment", {
                       <div class="container">
                           <h1>Contact us</h1>
                           <div class="row">
-                              <div class="col-md-8">
+                              <div class="col-lg-8">
                                   <div class="oe_structure">
                                       <div>
                                           <p>Contact us about anything related to our company or services.</p>
@@ -201,7 +201,7 @@ response = request.render("website.template_partner_comment", {
                                       <a role="button" t-attf-href="mailto:{{ res_company.email }}" class="btn btn-primary" id="o_contact_mail">Send us an email</a>
                                   </div>
                               </div>
-                              <div class="col-md-4 mb32">
+                              <div class="col-lg-4 mb32">
                                   <t t-call="website.company_description"/>
                               </div>
                           </div>