From 7f10b55a5035bd3cab48ba58a519510a25b94f60 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Tue, 24 Apr 2018 17:15:00 +0200
Subject: [REF] *: BS4, adapt display classes

The system completely changed. I also had to adapt classes to new
screen breakpoints.

hidden/hide -> d-none
show -> d-block
hidden-xs -> d-none d-md-(block/inline/...)
hidden-sm -> d-md-none d-lg-(block/inline/...)
hidden-md -> d-lg-none d-xl-(block/inline/...)
hidden-lg -> d-xl-none
visible-xs-* -> d-* d-md-none
visible-sm-* -> d-none d-md-* d-lg-none
visible-md-* -> d-none d-lg-* d-xl-none
visible-lg-* -> d-none d-xl-*
hidden-print -> d-print-none
visible-print-* -> d-none d-print-*
...
and all possible combination of those had to be handled too.
---
 addons/web_editor/static/src/xml/ace.xml      |  4 ++--
 addons/web_editor/static/src/xml/editor.xml   | 22 +++++++++++-----------
 addons/web_editor/static/src/xml/snippets.xml |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'addons/web_editor/static/src/xml')

diff --git a/addons/web_editor/static/src/xml/ace.xml b/addons/web_editor/static/src/xml/ace.xml
index de713540a67..b65af78b3dc 100644
--- a/addons/web_editor/static/src/xml/ace.xml
+++ b/addons/web_editor/static/src/xml/ace.xml
@@ -12,14 +12,14 @@
                 </ul>
             </div>
             <select id="ace-view-list" class="o_res_list"/>
-            <select id="ace-scss-list" class="o_res_list hidden"/>
+            <select id="ace-scss-list" class="o_res_list d-none"/>
             <label class="o_include_option oe_include_bundles">
                 <div class="o_checkbox">
                     <input type="checkbox" class="js_include_bundles" t-att-checked="widget.options.includeBundles ? 'checked' : undefined"/><span/>
                 </div>
                 Include Asset Bundles
             </label>
-            <label class="o_include_option o_include_all_scss hidden">
+            <label class="o_include_option o_include_all_scss d-none">
                 <div class="o_checkbox">
                     <input type="checkbox" class="js_include_all_scss" t-att-checked="widget.options.includeAllSCSS ? 'checked' : undefined"/><span/>
                 </div>
diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index 3c3085bfe79..f4a34c5ab4b 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -47,10 +47,10 @@
     <!-- Media Dialog (allows to choose an img/pictogram/video) -->
     <div t-name="web_editor.dialog.media">
         <ul class="nav nav-tabs" role="tablist">
-            <li class="active"><a role="tab" href="#editor-media-image" aria-controls="editor-media-image" data-toggle="tab" t-att-class="widget.noImages ? 'hidden' : ''">Image</a></li>
-            <li><a role="tab" href="#editor-media-document" aria-controls="editor-media-document" data-toggle="tab" t-att-class="widget.noDocuments ? 'hidden' : ''">Document</a></li>
-            <li><a role="tab" href="#editor-media-icon" aria-controls="editor-media-icon" data-toggle="tab" t-att-class="widget.noIcons ? 'hidden' : ''">Pictogram</a></li>
-            <li><a role="tab" href="#editor-media-video" aria-controls="editor-media-video" data-toggle="tab" t-att-class="widget.noVideos ? 'hidden' : ''">Video</a></li>
+            <li class="active"><a role="tab" href="#editor-media-image" aria-controls="editor-media-image" data-toggle="tab" t-att-class="widget.noImages ? 'd-none' : ''">Image</a></li>
+            <li><a role="tab" href="#editor-media-document" aria-controls="editor-media-document" data-toggle="tab" t-att-class="widget.noDocuments ? 'd-none' : ''">Document</a></li>
+            <li><a role="tab" href="#editor-media-icon" aria-controls="editor-media-icon" data-toggle="tab" t-att-class="widget.noIcons ? 'd-none' : ''">Pictogram</a></li>
+            <li><a role="tab" href="#editor-media-video" aria-controls="editor-media-video" data-toggle="tab" t-att-class="widget.noVideos ? 'd-none' : ''">Video</a></li>
             <li class="search pull-right">
                 <ul class="pager mb0 mt0">
                     <li class="previous">
@@ -90,7 +90,7 @@
             <input t-if="widget.options.res_model" type="hidden" name="res_model" t-att-value="widget.options.res_model"/>
             <div class="well">
                 <div class="form-group pull-left">
-                    <input type="file" class="hidden" name="upload" t-att-accept="widget.accept" multiple="multiple"/>
+                    <input type="file" class="d-none" name="upload" t-att-accept="widget.accept" multiple="multiple"/>
                     <input type="hidden" name="disable_optimization" value=""/>
                     <div class="btn-group">
                         <button class="btn btn-primary o_upload_image_button" type="button">Upload an image</button>
@@ -118,7 +118,7 @@
             <div class="existing-attachments">
                 <t t-call="web_editor.dialog.image.existing"/>
             </div>
-            <iframe class="hidden" name="fileframe"/>
+            <iframe class="d-none" name="fileframe"/>
         </form>
     </t>
     <t t-name="web_editor.dialog.image.existing">
@@ -198,7 +198,7 @@
                 <div class="text-right">
                     <small class="text-muted">Accepts <b><i>Youtube</i></b>, <b><i>Instagram</i></b>, <b><i>Vine.co</i></b>, <b><i>Vimeo</i></b>, <b><i>Dailymotion</i></b> and <b><i>Youku</i></b> videos</small>
                 </div>
-                <div class="o_video_dialog_options hidden mt48">
+                <div class="o_video_dialog_options d-none mt48">
                     <small class="text-muted">Options</small>
                     <ul class="list-group">
                         <li class="list-group-item o_yt_option o_vim_option o_dm_option">
@@ -226,7 +226,7 @@
                 </div>
             </div>
             <div id="video-preview">
-                <div class="o_video_dialog_preview_text small mt16 mb8 hidden">Preview</div>
+                <div class="o_video_dialog_preview_text small mt16 mb8 d-none">Preview</div>
                 <div class="media_iframe_video">
                     <div class="media_iframe_video_size"/>
                     <iframe class="o_video_dialog_iframe" allowfullscreen="allowfullscreen" frameborder="0" src=""/>
@@ -239,7 +239,7 @@
     <div t-name="web_editor.dialog.link" class="o_link_dialog">
         <div class="row">
             <form class="col-md-8 form-horizontal">
-                <div t-attf-class="form-group#{widget.needLabel ? '' : ' hidden'}">
+                <div t-attf-class="form-group#{widget.needLabel ? '' : ' d-none'}">
                     <label class="control-label col-sm-3" for="o_link_dialog_label_input">Link Label</label>
                     <div class="col-sm-9">
                         <input type="text" name="label" class="form-control" id="o_link_dialog_label_input" required="required" t-att-value="widget.data.text"/>
@@ -268,12 +268,12 @@
                         <div class="o_link_dialog_color">
                             <label role="button" t-attf-class="o_link_dialog_color_item o_btn_preview btn btn-link text-center" data-color="">
                                 <span>L</span>
-                                <input class="hidden link-style" name="link_style_color" type="radio" value=""/>
+                                <input class="d-none link-style" name="link_style_color" type="radio" value=""/>
                                 <i class="fa"/>
                             </label>
                             <t t-foreach="['primary', 'default', 'success', 'info', 'warning', 'danger', 'alpha', 'beta', 'gamma', 'delta', 'epsilon']" t-as="color">
                                 <label role="button" t-attf-class="o_link_dialog_color_item o_btn_preview btn btn-#{color}" t-attf-aria-label="Color for #{color}" t-attf-title="Color for #{color}">
-                                    <input type="radio" name="link_style_color" class="hidden link-style" t-att-value="color"/>
+                                    <input type="radio" name="link_style_color" class="d-none link-style" t-att-value="color"/>
                                     <i class="fa"/>
                                 </label>
                             </t>
diff --git a/addons/web_editor/static/src/xml/snippets.xml b/addons/web_editor/static/src/xml/snippets.xml
index dcd245f9a3e..361a5780b4d 100644
--- a/addons/web_editor/static/src/xml/snippets.xml
+++ b/addons/web_editor/static/src/xml/snippets.xml
@@ -11,7 +11,7 @@
             <div class="oe_overlay_options" contentEditable="false">
                 <div class="btn-group">
                     <a role="button" href="#" class="btn btn-default btn-sm oe_snippet_parent" title="Select Parent Container" aria-label="Select Parent Container"><i class="fa fa-lg fa-level-up"/></a>
-                    <div class="dropdown oe_options hidden btn-group">
+                    <div class="dropdown oe_options d-none btn-group">
                         <a role="button" href="#" data-toggle="dropdown" class="btn btn-primary btn-sm" title="Customize">Customize</a>
                         <ul class="dropdown-menu" role="menu"/>
                     </div>
-- 
cgit v1.2.3


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/web_editor/static/src/xml/ace.xml      |  6 +++---
 addons/web_editor/static/src/xml/backend.xml  |  2 +-
 addons/web_editor/static/src/xml/editor.xml   |  4 ++--
 addons/web_editor/static/src/xml/snippets.xml | 12 ++++++------
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'addons/web_editor/static/src/xml')

diff --git a/addons/web_editor/static/src/xml/ace.xml b/addons/web_editor/static/src/xml/ace.xml
index b65af78b3dc..4380a73ae54 100644
--- a/addons/web_editor/static/src/xml/ace.xml
+++ b/addons/web_editor/static/src/xml/ace.xml
@@ -5,7 +5,7 @@
     <div class="o_ace_view_editor">
         <div class="form-inline o_ace_view_editor_title">
             <div class="btn-group o_ace_type_switcher">
-                <button type="button" class="btn btn-sm btn-info dropdown-toggle" data-toggle="dropdown">XML (HTML)</button>
+                <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown">XML (HTML)</button>
                 <ul class="dropdown-menu" role="menu">
                     <li><a role="menuitem" href="#" class="o_ace_type_switcher_choice" data-type="xml">XML (HTML)</a></li>
                     <li><a role="menuitem" href="#" class="o_ace_type_switcher_choice" data-type="scss">SCSS (CSS)</a></li>
@@ -26,8 +26,8 @@
                 Include All SCSS Files
             </label>
             <div class="o_button_section">
-                <button data-action="save" type="submit" class="btn btn-sm btn-primary">Save</button>
-                <button data-action="close" type="button" class="btn btn-sm btn-default">Close</button>
+                <button data-action="save" type="submit" class="btn btn-primary">Save</button>
+                <button data-action="close" type="button" class="btn btn-default">Close</button>
             </div>
         </div>
         <div id="ace-view-id">
diff --git a/addons/web_editor/static/src/xml/backend.xml b/addons/web_editor/static/src/xml/backend.xml
index 40be4f05d07..76663cc9fbc 100644
--- a/addons/web_editor/static/src/xml/backend.xml
+++ b/addons/web_editor/static/src/xml/backend.xml
@@ -9,7 +9,7 @@
 
     <t t-name="web_editor.FieldTextHtml.button.translate">
         <div class="btn-group pull-right">
-            <button t-if="widget.field.translate" class="o_field_translate btn btn-default btn-sm btn-small" style="height: 24px; padding: 1px 17px 0px 5px" aria-label="Translate" title="Translate">
+            <button t-if="widget.field.translate" class="o_field_translate btn btn-default" style="height: 24px; padding: 1px 17px 0px 5px" aria-label="Translate" title="Translate">
                 <span class="fa fa-language fa-lg oe_input_icon"/>
             </button>
         </div>
diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index f4a34c5ab4b..01a4af11ac4 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -9,8 +9,8 @@
         <div id="web_editor-top-edit">
             <div id="web_editor-toolbars"/>
             <form class="navbar-form text-muted">
-                <button type="button" class="btn btn-sm btn-default" data-action="cancel"><i class="fa fa-times"/> Discard</button>
-                <button type="button" class="btn btn-sm btn-primary" data-action="save"><i class="fa fa-floppy-o"/> Save</button>
+                <button type="button" class="btn btn-default" data-action="cancel"><i class="fa fa-times"/> Discard</button>
+                <button type="button" class="btn btn-primary" data-action="save"><i class="fa fa-floppy-o"/> Save</button>
             </form>
         </div>
     </t>
diff --git a/addons/web_editor/static/src/xml/snippets.xml b/addons/web_editor/static/src/xml/snippets.xml
index 361a5780b4d..3c368ebaaf2 100644
--- a/addons/web_editor/static/src/xml/snippets.xml
+++ b/addons/web_editor/static/src/xml/snippets.xml
@@ -10,14 +10,14 @@
             </div>
             <div class="oe_overlay_options" contentEditable="false">
                 <div class="btn-group">
-                    <a role="button" href="#" class="btn btn-default btn-sm oe_snippet_parent" title="Select Parent Container" aria-label="Select Parent Container"><i class="fa fa-lg fa-level-up"/></a>
+                    <a role="button" href="#" class="btn btn-default oe_snippet_parent" title="Select Parent Container" aria-label="Select Parent Container"><i class="fa fa-lg fa-level-up"/></a>
                     <div class="dropdown oe_options d-none btn-group">
-                        <a role="button" href="#" data-toggle="dropdown" class="btn btn-primary btn-sm" title="Customize">Customize</a>
+                        <a role="button" href="#" data-toggle="dropdown" class="btn btn-primary" title="Customize">Customize</a>
                         <ul class="dropdown-menu" role="menu"/>
                     </div>
-                    <a role="button" href="#" class="btn btn-default btn-sm oe_snippet_move" title="Drag to Move" aria-label="Drag to Move"><i class="fa fa-arrows ml4 mr4"></i></a>
-                    <a role="button" href="#" class="btn btn-default btn-sm oe_snippet_clone" title="Duplicate Container" aria-label="Duplicate Container"><i class="fa fa-files-o ml4 mr4"></i></a>
-                    <a role="button" href="#" class="btn btn-default btn-sm oe_snippet_remove" title="Remove Block" aria-label="Remove Block"><i class="fa fa-trash-o ml4 mr4"></i></a>
+                    <a role="button" href="#" class="btn btn-default oe_snippet_move" title="Drag to Move" aria-label="Drag to Move"><i class="fa fa-arrows ml4 mr4"></i></a>
+                    <a role="button" href="#" class="btn btn-default oe_snippet_clone" title="Duplicate Container" aria-label="Duplicate Container"><i class="fa fa-files-o ml4 mr4"></i></a>
+                    <a role="button" href="#" class="btn btn-default oe_snippet_remove" title="Remove Block" aria-label="Remove Block"><i class="fa fa-trash-o ml4 mr4"></i></a>
                 </div>
             </div>
         </div>
@@ -40,7 +40,7 @@
     <!-- t-field options -->
     <t t-name="web_editor.many2one.button">
         <div class="btn-group">
-            <a role="button" href="#" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" title="Search Contact" aria-label="Search Contact"><i class="fa fa-search"></i></a>
+            <a role="button" href="#" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" title="Search Contact" aria-label="Search Contact"><i class="fa fa-search"></i></a>
             <ul class="dropdown-menu contact_menu" role="menu">
                 <li><a role="menuitem"><input href="#" type="email" placeholder="Search"/></a></li>
             </ul>
-- 
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/web_editor/static/src/xml/ace.xml      |  2 +-
 addons/web_editor/static/src/xml/backend.xml  |  2 +-
 addons/web_editor/static/src/xml/editor.xml   | 26 +++++++++++++-------------
 addons/web_editor/static/src/xml/snippets.xml | 10 +++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'addons/web_editor/static/src/xml')

diff --git a/addons/web_editor/static/src/xml/ace.xml b/addons/web_editor/static/src/xml/ace.xml
index 4380a73ae54..257ce6af707 100644
--- a/addons/web_editor/static/src/xml/ace.xml
+++ b/addons/web_editor/static/src/xml/ace.xml
@@ -27,7 +27,7 @@
             </label>
             <div class="o_button_section">
                 <button data-action="save" type="submit" class="btn btn-primary">Save</button>
-                <button data-action="close" type="button" class="btn btn-default">Close</button>
+                <button data-action="close" type="button" class="btn btn-secondary">Close</button>
             </div>
         </div>
         <div id="ace-view-id">
diff --git a/addons/web_editor/static/src/xml/backend.xml b/addons/web_editor/static/src/xml/backend.xml
index 76663cc9fbc..c4666a1aa96 100644
--- a/addons/web_editor/static/src/xml/backend.xml
+++ b/addons/web_editor/static/src/xml/backend.xml
@@ -9,7 +9,7 @@
 
     <t t-name="web_editor.FieldTextHtml.button.translate">
         <div class="btn-group pull-right">
-            <button t-if="widget.field.translate" class="o_field_translate btn btn-default" style="height: 24px; padding: 1px 17px 0px 5px" aria-label="Translate" title="Translate">
+            <button t-if="widget.field.translate" class="o_field_translate btn btn-secondary" style="height: 24px; padding: 1px 17px 0px 5px" aria-label="Translate" title="Translate">
                 <span class="fa fa-language fa-lg oe_input_icon"/>
             </button>
         </div>
diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index 01a4af11ac4..1928572fc0d 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -9,7 +9,7 @@
         <div id="web_editor-top-edit">
             <div id="web_editor-toolbars"/>
             <form class="navbar-form text-muted">
-                <button type="button" class="btn btn-default" data-action="cancel"><i class="fa fa-times"/> Discard</button>
+                <button type="button" class="btn btn-secondary" data-action="cancel"><i class="fa fa-times"/> Discard</button>
                 <button type="button" class="btn btn-primary" data-action="save"><i class="fa fa-floppy-o"/> Save</button>
             </form>
         </div>
@@ -54,10 +54,10 @@
             <li class="search pull-right">
                 <ul class="pager mb0 mt0">
                     <li class="previous">
-                        <a role="button" class="btn btn-default disabled" href="#"><i class="fa fa-angle-left"/>&#32;Previous</a>
+                        <a role="button" class="btn btn-secondary disabled" href="#"><i class="fa fa-angle-left"/>&#32;Previous</a>
                     </li>
                     <li class="next">
-                        <a role="button" class="btn btn-default disabled" href="#">Next&#32;<i class="fa fa-angle-right"/></a>
+                        <a role="button" class="btn btn-secondary disabled" href="#">Next&#32;<i class="fa fa-angle-right"/></a>
                     </li>
                 </ul>
             </li>
@@ -110,7 +110,7 @@
                     <label for="imageurl">Add an image URL</label>
                     <div class="form-group btn-group">
                         <input type="text" class="form-control url pull-left" id="imageurl" name="url" placeholder="https://www.odoo.com/logo.png" style="width: 250px;"/>
-                        <button type="button" class="btn btn-default o_upload_image_url_button" disabled="disabled">Add</button>
+                        <button type="button" class="btn btn-secondary o_upload_image_url_button" disabled="disabled">Add</button>
                     </div>
                 </div>
             </div>
@@ -271,7 +271,7 @@
                                 <input class="d-none link-style" name="link_style_color" type="radio" value=""/>
                                 <i class="fa"/>
                             </label>
-                            <t t-foreach="['primary', 'default', 'success', 'info', 'warning', 'danger', 'alpha', 'beta', 'gamma', 'delta', 'epsilon']" t-as="color">
+                            <t t-foreach="['primary', 'secondary', 'success', 'info', 'warning', 'danger', 'alpha', 'beta', 'gamma', 'delta', 'epsilon']" t-as="color">
                                 <label role="button" t-attf-class="o_link_dialog_color_item o_btn_preview btn btn-#{color}" t-attf-aria-label="Color for #{color}" t-attf-title="Color for #{color}">
                                     <input type="radio" name="link_style_color" class="d-none link-style" t-att-value="color"/>
                                     <i class="fa"/>
@@ -319,25 +319,25 @@
                <div class="btn-group" title="Aspect Ratio" data-toggle="buttons">
                    <t t-foreach="widget.aspectRatioList" t-as="ratio">
                        <t t-set="is_active" t-value="ratio[1] === widget.imageData.aspectRatio"/>
-                       <a href="#" t-attf-class="btn btn-default#{is_active and ' active' or ''}" data-event="ratio" t-att-data-label="ratio[1]" t-att-data-value="ratio[2]">
+                       <a href="#" t-attf-class="btn btn-secondary#{is_active and ' active' or ''}" data-event="ratio" t-att-data-label="ratio[1]" t-att-data-value="ratio[2]">
                             <t t-esc="ratio[0]"/>
                        </a>
                    </t>
                </div>
                <div class="btn-group" role="group">
-                   <a href="#" class="btn btn-default" title="Zoom In" data-event="zoom" data-value="0.1"><i class="fa fa-search-plus"/></a>
-                   <a href="#" class="btn btn-default" title="Zoom Out" data-event="zoom" data-value="-0.1"><i class="fa fa-search-minus"/></a>
+                   <a href="#" class="btn btn-secondary" title="Zoom In" data-event="zoom" data-value="0.1"><i class="fa fa-search-plus"/></a>
+                   <a href="#" class="btn btn-secondary" title="Zoom Out" data-event="zoom" data-value="-0.1"><i class="fa fa-search-minus"/></a>
                </div>
                <div class="btn-group" role="group">
-                   <a href="#" class="btn btn-default" title="Rotate Left" data-event="rotate" data-value="-45"><i class="fa fa-rotate-left"/></a>
-                   <a href="#" class="btn btn-default" title="Rotate Right" data-event="rotate" data-value="45"><i class="fa fa-rotate-right"/></a>
+                   <a href="#" class="btn btn-secondary" title="Rotate Left" data-event="rotate" data-value="-45"><i class="fa fa-rotate-left"/></a>
+                   <a href="#" class="btn btn-secondary" title="Rotate Right" data-event="rotate" data-value="45"><i class="fa fa-rotate-right"/></a>
                </div>
                <div class="btn-group" role="group">
-                   <a href="#" class="btn btn-default" title="Flip Horizontal" data-event="flip" data-value="horizontal" data-x="1"><i class="fa fa-arrows-h"/></a>
-                   <a href="#" class="btn btn-default" title="Flip Vertical" data-event="flip" data-value="vertical" data-y="1"><i class="fa fa-arrows-v"/></a>
+                   <a href="#" class="btn btn-secondary" title="Flip Horizontal" data-event="flip" data-value="horizontal" data-x="1"><i class="fa fa-arrows-h"/></a>
+                   <a href="#" class="btn btn-secondary" title="Flip Vertical" data-event="flip" data-value="vertical" data-y="1"><i class="fa fa-arrows-v"/></a>
                </div>
                <div class="btn-group" role="group">
-                   <a href="#" class="btn btn-default" title="Reset Image" data-event="reset"><i class="fa fa-refresh"/> Reset Image</a>
+                   <a href="#" class="btn btn-secondary" title="Reset Image" data-event="reset"><i class="fa fa-refresh"/> Reset Image</a>
                </div>
            </div>
        </t>
diff --git a/addons/web_editor/static/src/xml/snippets.xml b/addons/web_editor/static/src/xml/snippets.xml
index 3c368ebaaf2..586b920edf0 100644
--- a/addons/web_editor/static/src/xml/snippets.xml
+++ b/addons/web_editor/static/src/xml/snippets.xml
@@ -10,14 +10,14 @@
             </div>
             <div class="oe_overlay_options" contentEditable="false">
                 <div class="btn-group">
-                    <a role="button" href="#" class="btn btn-default oe_snippet_parent" title="Select Parent Container" aria-label="Select Parent Container"><i class="fa fa-lg fa-level-up"/></a>
+                    <a role="button" href="#" class="btn btn-secondary oe_snippet_parent" title="Select Parent Container" aria-label="Select Parent Container"><i class="fa fa-lg fa-level-up"/></a>
                     <div class="dropdown oe_options d-none btn-group">
                         <a role="button" href="#" data-toggle="dropdown" class="btn btn-primary" title="Customize">Customize</a>
                         <ul class="dropdown-menu" role="menu"/>
                     </div>
-                    <a role="button" href="#" class="btn btn-default oe_snippet_move" title="Drag to Move" aria-label="Drag to Move"><i class="fa fa-arrows ml4 mr4"></i></a>
-                    <a role="button" href="#" class="btn btn-default oe_snippet_clone" title="Duplicate Container" aria-label="Duplicate Container"><i class="fa fa-files-o ml4 mr4"></i></a>
-                    <a role="button" href="#" class="btn btn-default oe_snippet_remove" title="Remove Block" aria-label="Remove Block"><i class="fa fa-trash-o ml4 mr4"></i></a>
+                    <a role="button" href="#" class="btn btn-secondary oe_snippet_move" title="Drag to Move" aria-label="Drag to Move"><i class="fa fa-arrows ml4 mr4"></i></a>
+                    <a role="button" href="#" class="btn btn-secondary oe_snippet_clone" title="Duplicate Container" aria-label="Duplicate Container"><i class="fa fa-files-o ml4 mr4"></i></a>
+                    <a role="button" href="#" class="btn btn-secondary oe_snippet_remove" title="Remove Block" aria-label="Remove Block"><i class="fa fa-trash-o ml4 mr4"></i></a>
                 </div>
             </div>
         </div>
@@ -40,7 +40,7 @@
     <!-- t-field options -->
     <t t-name="web_editor.many2one.button">
         <div class="btn-group">
-            <a role="button" href="#" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" title="Search Contact" aria-label="Search Contact"><i class="fa fa-search"></i></a>
+            <a role="button" href="#" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" title="Search Contact" aria-label="Search Contact"><i class="fa fa-search"></i></a>
             <ul class="dropdown-menu contact_menu" role="menu">
                 <li><a role="menuitem"><input href="#" type="email" placeholder="Search"/></a></li>
             </ul>
-- 
cgit v1.2.3


From 1c1c0897e8eca607c7f1b96b68a06c026c543e6a Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Wed, 14 Mar 2018 16:21:14 +0100
Subject: [REF] *: BS4, adapt dropdowns and carets

- The dropdown structure was simplified, allowing to get rid of the
  3-levels structure induced by <ul/> elements and dropdowns can now
  contain anything. The class 'dropdown-item' is now mandatory for
  each dropdown clickable element. The class 'dropdown-item-text' can
  be used to add same padding and style but without making the element
  have a clickable look.

- Dividers now use the class 'dropdown-divider'

- The way dropdowns are opened and hidden also changed (before the
  'open' class was added on the `.dropdown-menu` parent, now the
  'show' class is added on both the `.dropdown-menu` parent and the
  `.dropdown-menu` itself).

- JS-wise, no click event handlers can be put on `.dropdown-toggle`
  elements anymore (instead, use handlers for dropdown events).

- Carets are automatically put on `.dropdown-toggle` elements, so this
  commit replaces the `.caret` elements with this. This feature was
  possible to disable but would prevent us from adding a caret with
  scss. Also, this simplifies the DOM. The 'o-no-caret' class was also
  introduced to allow using the 'dropdown-toggle' class on non-caret
  elements.

- Also adapt the scss to use $caret-width instead of $caret-width-base
---
 addons/web_editor/static/src/xml/ace.xml      | 8 ++++----
 addons/web_editor/static/src/xml/editor.xml   | 9 +++------
 addons/web_editor/static/src/xml/snippets.xml | 8 ++++----
 3 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'addons/web_editor/static/src/xml')

diff --git a/addons/web_editor/static/src/xml/ace.xml b/addons/web_editor/static/src/xml/ace.xml
index 257ce6af707..800a0ef2ced 100644
--- a/addons/web_editor/static/src/xml/ace.xml
+++ b/addons/web_editor/static/src/xml/ace.xml
@@ -6,10 +6,10 @@
         <div class="form-inline o_ace_view_editor_title">
             <div class="btn-group o_ace_type_switcher">
                 <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown">XML (HTML)</button>
-                <ul class="dropdown-menu" role="menu">
-                    <li><a role="menuitem" href="#" class="o_ace_type_switcher_choice" data-type="xml">XML (HTML)</a></li>
-                    <li><a role="menuitem" href="#" class="o_ace_type_switcher_choice" data-type="scss">SCSS (CSS)</a></li>
-                </ul>
+                <div class="dropdown-menu" role="menu">
+                    <a role="menuitem" href="#" class="dropdown-item o_ace_type_switcher_choice" data-type="xml">XML (HTML)</a>
+                    <a role="menuitem" href="#" class="dropdown-item o_ace_type_switcher_choice" data-type="scss">SCSS (CSS)</a>
+                </div>
             </div>
             <select id="ace-view-list" class="o_res_list"/>
             <select id="ace-scss-list" class="o_res_list d-none"/>
diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index 1928572fc0d..96f126391cd 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -95,14 +95,11 @@
                     <div class="btn-group">
                         <button class="btn btn-primary o_upload_image_button" type="button">Upload an image</button>
                         <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown" type="button">
-                            <span class="caret"/>
                             <span class="sr-only">Alternate Upload</span>
                         </button>
-                        <ul class="dropdown-menu" role="menu">
-                            <li>
-                                <a role="menuitem" class="o_upload_image_button_no_optimization">Upload image without optimization</a>
-                            </li>
-                        </ul>
+                        <div class="dropdown-menu" role="menu">
+                            <a role="menuitem" class="dropdown-item o_upload_image_button_no_optimization">Upload image without optimization</a>
+                        </div>
                     </div>
                 </div>
                 <div>
diff --git a/addons/web_editor/static/src/xml/snippets.xml b/addons/web_editor/static/src/xml/snippets.xml
index 586b920edf0..a0c35288b93 100644
--- a/addons/web_editor/static/src/xml/snippets.xml
+++ b/addons/web_editor/static/src/xml/snippets.xml
@@ -13,7 +13,7 @@
                     <a role="button" href="#" class="btn btn-secondary oe_snippet_parent" title="Select Parent Container" aria-label="Select Parent Container"><i class="fa fa-lg fa-level-up"/></a>
                     <div class="dropdown oe_options d-none btn-group">
                         <a role="button" href="#" data-toggle="dropdown" class="btn btn-primary" title="Customize">Customize</a>
-                        <ul class="dropdown-menu" role="menu"/>
+                        <div class="dropdown-menu" role="menu"/>
                     </div>
                     <a role="button" href="#" class="btn btn-secondary oe_snippet_move" title="Drag to Move" aria-label="Drag to Move"><i class="fa fa-arrows ml4 mr4"></i></a>
                     <a role="button" href="#" class="btn btn-secondary oe_snippet_clone" title="Duplicate Container" aria-label="Duplicate Container"><i class="fa fa-files-o ml4 mr4"></i></a>
@@ -41,9 +41,9 @@
     <t t-name="web_editor.many2one.button">
         <div class="btn-group">
             <a role="button" href="#" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" title="Search Contact" aria-label="Search Contact"><i class="fa fa-search"></i></a>
-            <ul class="dropdown-menu contact_menu" role="menu">
-                <li><a role="menuitem"><input href="#" type="email" placeholder="Search"/></a></li>
-            </ul>
+            <div class="dropdown-menu contact_menu" role="menu">
+                <a role="menuitem" class="dropdown-item"><input href="#" type="email" placeholder="Search"/></a>
+            </div>
         </div>
     </t>
 
-- 
cgit v1.2.3


From de214e37429213fe9f329ff3f11885fee3e271c4 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 15 Mar 2018 14:06:31 +0100
Subject: [REF] *: BS4, 'img-responsive' -> 'img-fluid'

---
 addons/web_editor/static/src/xml/editor.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web_editor/static/src/xml')

diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index 96f126391cd..651cd60f883 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -310,7 +310,7 @@
         </div>
         <t t-else="">
            <div class="o_crop_area">
-                <img class="img img-responsive o_cropper_image" t-att-src="widget.imageData.originalSrc"/>
+                <img class="img img-fluid o_cropper_image" t-att-src="widget.imageData.originalSrc"/>
            </div>
            <div class="o_crop_options text-center mt16">
                <div class="btn-group" title="Aspect Ratio" data-toggle="buttons">
-- 
cgit v1.2.3


From 09f40036b9c14161db90c6128861369c91c8c64e Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Mon, 16 Jul 2018 16:49:25 +0200
Subject: [REF] *: BS4, review the 'nav' and 'navbar' components

Now the nav structure is more declarative: the 'nav-item' and 'nav-link'
classes have to be put on related nav item and links. Also, the 'active'
class has to be put on links instead of items.

Same as for the navbar component:
- The navbar structure was simplified and meant to be more declarative.
- The navbar colors are also now handled by a different set of classes.

The 'nav-stacked' class was removed and replaced by flex utilities.

The set of classes for colors and nav styles also changed.
---
 addons/web_editor/static/src/xml/editor.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'addons/web_editor/static/src/xml')

diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index 651cd60f883..3cfa54937b6 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -47,11 +47,11 @@
     <!-- Media Dialog (allows to choose an img/pictogram/video) -->
     <div t-name="web_editor.dialog.media">
         <ul class="nav nav-tabs" role="tablist">
-            <li class="active"><a role="tab" href="#editor-media-image" aria-controls="editor-media-image" data-toggle="tab" t-att-class="widget.noImages ? 'd-none' : ''">Image</a></li>
-            <li><a role="tab" href="#editor-media-document" aria-controls="editor-media-document" data-toggle="tab" t-att-class="widget.noDocuments ? 'd-none' : ''">Document</a></li>
-            <li><a role="tab" href="#editor-media-icon" aria-controls="editor-media-icon" data-toggle="tab" t-att-class="widget.noIcons ? 'd-none' : ''">Pictogram</a></li>
-            <li><a role="tab" href="#editor-media-video" aria-controls="editor-media-video" data-toggle="tab" t-att-class="widget.noVideos ? 'd-none' : ''">Video</a></li>
-            <li class="search pull-right">
+            <li class="nav-item"><a role="tab" href="#editor-media-image" aria-controls="editor-media-image" data-toggle="tab" t-attf-class="nav-link active#{widget.noImages ? ' d-none' : ''}">Image</a></li>
+            <li class="nav-item"><a role="tab" href="#editor-media-document" aria-controls="editor-media-document" data-toggle="tab" t-attf-class="nav-link#{widget.noDocuments ? ' d-none' : ''}">Document</a></li>
+            <li class="nav-item"><a role="tab" href="#editor-media-icon" aria-controls="editor-media-icon" data-toggle="tab" t-attf-class="nav-link#{widget.noIcons ? ' d-none' : ''}">Pictogram</a></li>
+            <li class="nav-item"><a role="tab" href="#editor-media-video" aria-controls="editor-media-video" data-toggle="tab" t-attf-class="nav-link#{widget.noVideos ? ' d-none' : ''}">Video</a></li>
+            <li class="nav-item search pull-right">
                 <ul class="pager mb0 mt0">
                     <li class="previous">
                         <a role="button" class="btn btn-secondary disabled" href="#"><i class="fa fa-angle-left"/>&#32;Previous</a>
@@ -61,7 +61,7 @@
                     </li>
                 </ul>
             </li>
-            <li class="search pull-right">
+            <li class="nav-item search pull-right">
                 <div class="form-group">
                     <input class="form-control" id="icon-search" type="search"/>
                     <span class="fa fa-search" title="Search" role="img" aria-label="Search"/>
-- 
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/web_editor/static/src/xml/editor.xml | 54 ++++++++++++++---------------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to 'addons/web_editor/static/src/xml')

diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index 3cfa54937b6..c94b9ee18fe 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -31,14 +31,14 @@
     <!-- Alt Dialog (allows to change alt and title of page images) -->
     <form t-name="web_editor.dialog.alt" action="#" class="form-horizontal">
         <div class="form-group">
-            <label class="col-sm-3 control-label" for="alt">Description (alt tag)</label>
-            <div class="col-sm-8">
+            <label class="col-md-3 control-label" for="alt">Description (alt tag)</label>
+            <div class="col-md-8">
                 <input class="form-control" id="alt" required="required" t-att-value="widget.alt" type="text"/>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label" for="title">Tooltip</label>
-            <div class="col-sm-8">
+            <label class="col-md-3 control-label" for="title">Tooltip</label>
+            <div class="col-md-8">
                 <input class="form-control" id="title" required="required" t-att-value="widget.title" type="text"/>
             </div>
         </div>
@@ -140,7 +140,7 @@
     <t t-name="web_editor.dialog.image.existing.content">
         <div class="existing-attachments">
             <div class="row mt16" t-as="row" t-foreach="rows">
-                <div class="col-sm-2 o_existing_attachment_cell" t-as="attachment" t-foreach="row">
+                <div class="col-2 o_existing_attachment_cell" t-as="attachment" t-foreach="row">
                     <i t-if="attachment.res_model === 'ir.ui.view'" class="fa fa-times o_existing_attachment_remove" title="This file is a public view attachment" role="img" aria-label="This file is a public view attachment" t-att-data-id="attachment.id"/>
                     <i t-else="" class="fa fa-times o_existing_attachment_remove" title="This file is attached to the current record" role="img" aria-label="This file is attached to the current record" t-att-data-id="attachment.id"/>
                     <div class="o_attachment_border" t-att-style="attachment.res_model === 'ir.ui.view' ? null : 'border: 1px solid #5cb85c;'"><div t-att-data-src="attachment.src" t-att-data-url="attachment.url" role="img" t-att-aria-label="attachment.name" t-att-title="attachment.name" t-att-data-id="attachment.id" t-att-data-mimetype="attachment.mimetype" class="o_image o_image_loading"/></div>
@@ -235,23 +235,23 @@
     <!-- Link Dialog (allows to choose a style and content for a link on the page) -->
     <div t-name="web_editor.dialog.link" class="o_link_dialog">
         <div class="row">
-            <form class="col-md-8 form-horizontal">
+            <form class="col-lg-8 form-horizontal">
                 <div t-attf-class="form-group#{widget.needLabel ? '' : ' d-none'}">
-                    <label class="control-label col-sm-3" for="o_link_dialog_label_input">Link Label</label>
-                    <div class="col-sm-9">
+                    <label class="control-label col-md-3" for="o_link_dialog_label_input">Link Label</label>
+                    <div class="col-md-9">
                         <input type="text" name="label" class="form-control" id="o_link_dialog_label_input" required="required" t-att-value="widget.data.text"/>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="control-label col-sm-3" for="o_link_dialog_url_input">URL or Email</label>
-                    <div class="col-sm-9">
+                    <label class="control-label col-md-3" for="o_link_dialog_url_input">URL or Email</label>
+                    <div class="col-md-9">
                         <input type="text" name="url" class="form-control" id="o_link_dialog_url_input" required="required"/>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="control-label col-sm-3">Size</label>
-                    <div class="col-sm-9">
-                        <select name="link_style_size" class="form-control col-sm-3 link-style">
+                    <label class="control-label col-md-3">Size</label>
+                    <div class="col-md-9">
+                        <select name="link_style_size" class="form-control col-md-3 link-style">
                             <option value="xs">Extra Small</option>
                             <option value="sm">Small</option>
                             <option value="" selected="selected">Medium</option>
@@ -260,8 +260,8 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="control-label col-sm-3">Color</label>
-                    <div class="col-sm-9">
+                    <label class="control-label col-md-3">Color</label>
+                    <div class="col-md-9">
                         <div class="o_link_dialog_color">
                             <label role="button" t-attf-class="o_link_dialog_color_item o_btn_preview btn btn-link text-center" data-color="">
                                 <span>L</span>
@@ -278,7 +278,7 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    <div class="col-sm-offset-3 col-sm-9">
+                    <div class="offset-md-3 col-md-9">
                         <label class="o_switch">
                             <input type="checkbox" name="is_new_window" t-att-checked="widget.data.isNewWindow ? 'checked' : undefined"/>
                             <span/>
@@ -287,7 +287,7 @@
                     </div>
                 </div>
             </form>
-            <div class="col-md-4 o_link_dialog_preview">
+            <div class="col-lg-4 o_link_dialog_preview">
                 <div class="form-group text-center">
                     <label>Preview</label>
                     <div style="overflow: auto; max-width: 100%; max-height: 200px;">
@@ -366,8 +366,8 @@
         <div class="o_bg_img_opt" data-value="contain">
             <form class="form-horizontal">
                 <div class="form-group">
-                    <label class="col-sm-2 control-label" for="repeatInput">Repeat</label>
-                    <div class="col-sm-5">
+                    <label class="col-md-2 control-label" for="repeatInput">Repeat</label>
+                    <div class="col-md-5">
                         <div class="checkbox">
                             <label>
                                 <input type="checkbox" id="o_bg_img_opt_contain_repeat"/>
@@ -382,8 +382,8 @@
                 <legend>Background size</legend>
                 <p>Sets the width and height of the background image in percent of the parent element.</p>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label" for="o_bg_img_opt_custom_size_x">Background width</label>
-                    <div class="col-sm-5">
+                    <label class="col-md-3 control-label" for="o_bg_img_opt_custom_size_x">Background width</label>
+                    <div class="col-md-5">
                         <div class="input-group">
                             <input type="number" min="0" max="100" class="form-control input-sm" id="o_bg_img_opt_custom_size_x" placeholder="auto"/>
                             <div class="input-group-addon">%</div>
@@ -391,8 +391,8 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label" for="o_bg_img_opt_custom_size_y">Background height</label>
-                    <div class="col-sm-5">
+                    <label class="col-md-3 control-label" for="o_bg_img_opt_custom_size_y">Background height</label>
+                    <div class="col-md-5">
                         <div class="input-group">
                             <input type="number" min="0" max="100" class="form-control input-sm" id="o_bg_img_opt_custom_size_y" placeholder="auto"/>
                             <div class="input-group-addon">%</div>
@@ -404,8 +404,8 @@
                 <legend>Background position</legend>
                 <p>Set the starting position of the background image.</p>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label" for="o_bg_img_opt_custom_pos_x">Horizontal</label>
-                    <div class="col-sm-5">
+                    <label class="col-md-3 control-label" for="o_bg_img_opt_custom_pos_x">Horizontal</label>
+                    <div class="col-md-5">
                         <div class="input-group">
                             <input type="number" min="0" max="100" class="form-control input-sm" id="o_bg_img_opt_custom_pos_x" placeholder="auto"/>
                             <div class="input-group-addon">%</div>
@@ -413,8 +413,8 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label" for="o_bg_img_opt_custom_pos_y">Vertical</label>
-                    <div class="col-sm-5">
+                    <label class="col-md-3 control-label" for="o_bg_img_opt_custom_pos_y">Vertical</label>
+                    <div class="col-md-5">
                         <div class="input-group">
                             <input type="number" min="0" max="100" class="form-control input-sm" id="o_bg_img_opt_custom_pos_y" placeholder="auto"/>
                             <div class="input-group-addon">%</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/web_editor/static/src/xml/editor.xml | 30 +++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'addons/web_editor/static/src/xml')

diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index c94b9ee18fe..1b478a09d9c 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -88,17 +88,19 @@
             <input type="hidden" name="filters" t-att-value="widget.firstFilters.join('_')"/>
             <input t-if="widget.options.res_id" type="hidden" name="res_id" t-att-value="widget.options.res_id"/>
             <input t-if="widget.options.res_model" type="hidden" name="res_model" t-att-value="widget.options.res_model"/>
-            <div class="well">
-                <div class="form-group pull-left">
-                    <input type="file" class="d-none" name="upload" t-att-accept="widget.accept" multiple="multiple"/>
-                    <input type="hidden" name="disable_optimization" value=""/>
-                    <div class="btn-group">
-                        <button class="btn btn-primary o_upload_image_button" type="button">Upload an image</button>
-                        <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown" type="button">
-                            <span class="sr-only">Alternate Upload</span>
-                        </button>
-                        <div class="dropdown-menu" role="menu">
-                            <a role="menuitem" class="dropdown-item o_upload_image_button_no_optimization">Upload image without optimization</a>
+            <div class="card">
+                <div class="card-body">
+                    <div class="form-group pull-left">
+                        <input type="file" class="d-none" name="upload" t-att-accept="widget.accept" multiple="multiple"/>
+                        <input type="hidden" name="disable_optimization" value=""/>
+                        <div class="btn-group">
+                            <button class="btn btn-primary o_upload_image_button" type="button">Upload an image</button>
+                            <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown" type="button">
+                                <span class="sr-only">Alternate Upload</span>
+                            </button>
+                            <div class="dropdown-menu" role="menu">
+                                <a role="menuitem" class="dropdown-item o_upload_image_button_no_optimization">Upload image without optimization</a>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -184,8 +186,8 @@
     </t>
 
     <!-- Video choosing part of the Media Dialog -->
-    <t t-name="web_editor.dialog.video">
-        <form action="#" class="form-inline well">
+    <div t-name="web_editor.dialog.video" class="card">
+        <form action="#" class="form-inline card-body">
             <div class="o_video_dialog_form">
                 <div class="form-group" id="o_video_form_group">
                     <label class="mt8" for="o_video_text">Video code <small class="text-muted">(URL or Embed)</small></label>
@@ -230,7 +232,7 @@
                 </div>
             </div>
         </form>
-    </t>
+    </div>
 
     <!-- Link Dialog (allows to choose a style and content for a link on the page) -->
     <div t-name="web_editor.dialog.link" class="o_link_dialog">
-- 
cgit v1.2.3


From b437808f6696a8d202dac079fe8e40ade9779704 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Tue, 22 May 2018 12:07:42 +0200
Subject: [REF] *: BS4, adapt input-group structure

The input-group-addon class has been replaced by a combination of the
input-group-text and the input-group-append/prepend classes. The
input-group-btn class is replaced by the input-group-append/prepend
classes.
---
 addons/web_editor/static/src/xml/editor.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'addons/web_editor/static/src/xml')

diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index 1b478a09d9c..187c880d3ae 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -388,7 +388,9 @@
                     <div class="col-md-5">
                         <div class="input-group">
                             <input type="number" min="0" max="100" class="form-control input-sm" id="o_bg_img_opt_custom_size_x" placeholder="auto"/>
-                            <div class="input-group-addon">%</div>
+                            <div class="input-group-append">
+                                <div class="input-group-text">%</div>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -397,7 +399,9 @@
                     <div class="col-md-5">
                         <div class="input-group">
                             <input type="number" min="0" max="100" class="form-control input-sm" id="o_bg_img_opt_custom_size_y" placeholder="auto"/>
-                            <div class="input-group-addon">%</div>
+                            <div class="input-group-append">
+                                <div class="input-group-text">%</div>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -410,7 +414,9 @@
                     <div class="col-md-5">
                         <div class="input-group">
                             <input type="number" min="0" max="100" class="form-control input-sm" id="o_bg_img_opt_custom_pos_x" placeholder="auto"/>
-                            <div class="input-group-addon">%</div>
+                            <div class="input-group-append">
+                                <div class="input-group-text">%</div>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -419,7 +425,9 @@
                     <div class="col-md-5">
                         <div class="input-group">
                             <input type="number" min="0" max="100" class="form-control input-sm" id="o_bg_img_opt_custom_pos_y" placeholder="auto"/>
-                            <div class="input-group-addon">%</div>
+                            <div class="input-group-append">
+                                <div class="input-group-text">%</div>
+                            </div>
                         </div>
                     </div>
                 </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/web_editor/static/src/xml/editor.xml | 72 ++++++++++++++---------------
 1 file changed, 36 insertions(+), 36 deletions(-)

(limited to 'addons/web_editor/static/src/xml')

diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index 187c880d3ae..b5f4dff8a3f 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -29,15 +29,15 @@
     <!--=================-->
 
     <!-- Alt Dialog (allows to change alt and title of page images) -->
-    <form t-name="web_editor.dialog.alt" action="#" class="form-horizontal">
-        <div class="form-group">
-            <label class="col-md-3 control-label" for="alt">Description (alt tag)</label>
+    <form t-name="web_editor.dialog.alt" action="#">
+        <div class="form-group row">
+            <label class="col-md-3 col-form-label" for="alt">Description (alt tag)</label>
             <div class="col-md-8">
                 <input class="form-control" id="alt" required="required" t-att-value="widget.alt" type="text"/>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-md-3 control-label" for="title">Tooltip</label>
+        <div class="form-group row">
+            <label class="col-md-3 col-form-label" for="title">Tooltip</label>
             <div class="col-md-8">
                 <input class="form-control" id="title" required="required" t-att-value="widget.title" type="text"/>
             </div>
@@ -113,7 +113,7 @@
                     </div>
                 </div>
             </div>
-            <div class="help-block"/>
+            <div class="form-text"/>
             <div class="existing-attachments">
                 <t t-call="web_editor.dialog.image.existing"/>
             </div>
@@ -128,9 +128,9 @@
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
                         <h3 class="modal-title">Select a Picture</h3>
                     </header>
-                    <main class="modal-body has-error">
+                    <main class="modal-body o_has_error">
                         <div class="existing-attachments"/>
-                        <div class="help-block"/>
+                        <div class="form-text"/>
                     </main>
                     <footer class="modal-footer">
                         <a data-dismiss="modal" href="#" aria-label="Discard">Discard</a>
@@ -151,7 +151,7 @@
         </div>
     </t>
     <t t-name="web_editor.dialog.image.existing.error">
-        <div class="help-block">
+        <div class="form-text">
             <p>The image could not be deleted because it is used in the
                following pages or views:</p>
             <ul t-as="view" t-foreach="views">
@@ -192,7 +192,7 @@
                 <div class="form-group" id="o_video_form_group">
                     <label class="mt8" for="o_video_text">Video code <small class="text-muted">(URL or Embed)</small></label>
                     <textarea class="form-control url" id="o_video_text" placeholder="Copy-paste your URL or embed code here"/>
-                    <label class="control-label o_validate_feedback" for="o_video_text"><i class="fa fa-check" role="img" aria-label="Checked" title="Checked"/><i class="fa fa-exclamation-triangle" role="img" aria-label="Attention" title="Attention"/></label>
+                    <label class="col-form-label o_validate_feedback" for="o_video_text"><i class="fa fa-check" role="img" aria-label="Checked" title="Checked"/><i class="fa fa-exclamation-triangle" role="img" aria-label="Attention" title="Attention"/></label>
                 </div>
                 <div class="text-right">
                     <small class="text-muted">Accepts <b><i>Youtube</i></b>, <b><i>Instagram</i></b>, <b><i>Vine.co</i></b>, <b><i>Vimeo</i></b>, <b><i>Dailymotion</i></b> and <b><i>Youku</i></b> videos</small>
@@ -237,21 +237,21 @@
     <!-- Link Dialog (allows to choose a style and content for a link on the page) -->
     <div t-name="web_editor.dialog.link" class="o_link_dialog">
         <div class="row">
-            <form class="col-lg-8 form-horizontal">
-                <div t-attf-class="form-group#{widget.needLabel ? '' : ' d-none'}">
-                    <label class="control-label col-md-3" for="o_link_dialog_label_input">Link Label</label>
+            <form class="col-lg-8">
+                <div t-attf-class="form-group row#{widget.needLabel ? '' : ' d-none'}">
+                    <label class="col-form-label col-md-3" for="o_link_dialog_label_input">Link Label</label>
                     <div class="col-md-9">
                         <input type="text" name="label" class="form-control" id="o_link_dialog_label_input" required="required" t-att-value="widget.data.text"/>
                     </div>
                 </div>
-                <div class="form-group">
-                    <label class="control-label col-md-3" for="o_link_dialog_url_input">URL or Email</label>
+                <div class="form-group row">
+                    <label class="col-form-label col-md-3" for="o_link_dialog_url_input">URL or Email</label>
                     <div class="col-md-9">
                         <input type="text" name="url" class="form-control" id="o_link_dialog_url_input" required="required"/>
                     </div>
                 </div>
-                <div class="form-group">
-                    <label class="control-label col-md-3">Size</label>
+                <div class="form-group row">
+                    <label class="col-form-label col-md-3">Size</label>
                     <div class="col-md-9">
                         <select name="link_style_size" class="form-control col-md-3 link-style">
                             <option value="xs">Extra Small</option>
@@ -261,8 +261,8 @@
                         </select>
                     </div>
                 </div>
-                <div class="form-group">
-                    <label class="control-label col-md-3">Color</label>
+                <div class="form-group row">
+                    <label class="col-form-label col-md-3">Color</label>
                     <div class="col-md-9">
                         <div class="o_link_dialog_color">
                             <label role="button" t-attf-class="o_link_dialog_color_item o_btn_preview btn btn-link text-center" data-color="">
@@ -279,7 +279,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="form-group">
+                <div class="form-group row">
                     <div class="offset-md-3 col-md-9">
                         <label class="o_switch">
                             <input type="checkbox" name="is_new_window" t-att-checked="widget.data.isNewWindow ? 'checked' : undefined"/>
@@ -366,9 +366,9 @@
             </div>
         </div>
         <div class="o_bg_img_opt" data-value="contain">
-            <form class="form-horizontal">
-                <div class="form-group">
-                    <label class="col-md-2 control-label" for="repeatInput">Repeat</label>
+            <form>
+                <div class="form-group row">
+                    <label class="col-md-2 col-form-label" for="repeatInput">Repeat</label>
                     <div class="col-md-5">
                         <div class="checkbox">
                             <label>
@@ -379,26 +379,26 @@
                 </div>
             </form>
         </div>
-        <form class="o_bg_img_opt form-horizontal" data-value="custom">
+        <form class="o_bg_img_opt" data-value="custom">
             <fieldset>
                 <legend>Background size</legend>
                 <p>Sets the width and height of the background image in percent of the parent element.</p>
-                <div class="form-group">
-                    <label class="col-md-3 control-label" for="o_bg_img_opt_custom_size_x">Background width</label>
+                <div class="form-group row">
+                    <label class="col-md-3 col-form-label" for="o_bg_img_opt_custom_size_x">Background width</label>
                     <div class="col-md-5">
                         <div class="input-group">
-                            <input type="number" min="0" max="100" class="form-control input-sm" id="o_bg_img_opt_custom_size_x" placeholder="auto"/>
+                            <input type="number" min="0" max="100" class="form-control form-control-sm" id="o_bg_img_opt_custom_size_x" placeholder="auto"/>
                             <div class="input-group-append">
                                 <div class="input-group-text">%</div>
                             </div>
                         </div>
                     </div>
                 </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label" for="o_bg_img_opt_custom_size_y">Background height</label>
+                <div class="form-group row">
+                    <label class="col-md-3 col-form-label" for="o_bg_img_opt_custom_size_y">Background height</label>
                     <div class="col-md-5">
                         <div class="input-group">
-                            <input type="number" min="0" max="100" class="form-control input-sm" id="o_bg_img_opt_custom_size_y" placeholder="auto"/>
+                            <input type="number" min="0" max="100" class="form-control form-control-sm" id="o_bg_img_opt_custom_size_y" placeholder="auto"/>
                             <div class="input-group-append">
                                 <div class="input-group-text">%</div>
                             </div>
@@ -409,22 +409,22 @@
             <fieldset>
                 <legend>Background position</legend>
                 <p>Set the starting position of the background image.</p>
-                <div class="form-group">
-                    <label class="col-md-3 control-label" for="o_bg_img_opt_custom_pos_x">Horizontal</label>
+                <div class="form-group row">
+                    <label class="col-md-3 col-form-label" for="o_bg_img_opt_custom_pos_x">Horizontal</label>
                     <div class="col-md-5">
                         <div class="input-group">
-                            <input type="number" min="0" max="100" class="form-control input-sm" id="o_bg_img_opt_custom_pos_x" placeholder="auto"/>
+                            <input type="number" min="0" max="100" class="form-control form-control-sm" id="o_bg_img_opt_custom_pos_x" placeholder="auto"/>
                             <div class="input-group-append">
                                 <div class="input-group-text">%</div>
                             </div>
                         </div>
                     </div>
                 </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label" for="o_bg_img_opt_custom_pos_y">Vertical</label>
+                <div class="form-group row">
+                    <label class="col-md-3 col-form-label" for="o_bg_img_opt_custom_pos_y">Vertical</label>
                     <div class="col-md-5">
                         <div class="input-group">
-                            <input type="number" min="0" max="100" class="form-control input-sm" id="o_bg_img_opt_custom_pos_y" placeholder="auto"/>
+                            <input type="number" min="0" max="100" class="form-control form-control-sm" id="o_bg_img_opt_custom_pos_y" placeholder="auto"/>
                             <div class="input-group-append">
                                 <div class="input-group-text">%</div>
                             </div>
-- 
cgit v1.2.3


From f4fbaf1efae11e8bd3b1a2938ab765d391764a1b Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 24 May 2018 16:56:42 +0200
Subject: [REF] web, *: BS4, use custom BS4 checkbox everywhere

Before this commit, Odoo used checkboxes in three different ways:

- A simple <input type="checkbox"/>, mainly in the frontend. The style
  is browser dependant.

- Same as above but with the BS3, checkbox structure. The style is still
  the same, but the alignement is supposed to be better (which is not
  always the case).

- The Odoo official structure:
	```
	<div class="o_checkbox">
	    <input type="checkbox"/>
	    <span/>
	</div>
	```
  which allows to have a cross-browser checkbox style and correct
  alignements.

The goal after this commit is to only use the BS4 *custom* checkbox
structure to achieve the same goal as our official structure (and
remove that one):

```
<div class="custom-control custom-checkbox">
  <input type="checkbox" class="custom-control-input" id="customCheck1">
  <label class="custom-control-label" for="customCheck1">...</label>
</div>
```

/!\ Labels are now required (use a zero-width space if necessary)
---
 addons/web_editor/static/src/xml/ace.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'addons/web_editor/static/src/xml')

diff --git a/addons/web_editor/static/src/xml/ace.xml b/addons/web_editor/static/src/xml/ace.xml
index 800a0ef2ced..c78ce8a4d4a 100644
--- a/addons/web_editor/static/src/xml/ace.xml
+++ b/addons/web_editor/static/src/xml/ace.xml
@@ -14,16 +14,22 @@
             <select id="ace-view-list" class="o_res_list"/>
             <select id="ace-scss-list" class="o_res_list d-none"/>
             <label class="o_include_option oe_include_bundles">
-                <div class="o_checkbox">
-                    <input type="checkbox" class="js_include_bundles" t-att-checked="widget.options.includeBundles ? 'checked' : undefined"/><span/>
+                <div class="custom-control custom-checkbox">
+                    <input type="checkbox" id="o_ace_view_editor_include_bundle"
+                        class="custom-control-input js_include_bundles"
+                        t-att-checked="widget.options.includeBundles ? 'checked' : undefined"/>
+                    <label for="o_ace_view_editor_include_bundle"
+                        class="custom-control-label">Include Asset Bundles</label>
                 </div>
-                Include Asset Bundles
             </label>
             <label class="o_include_option o_include_all_scss d-none">
-                <div class="o_checkbox">
-                    <input type="checkbox" class="js_include_all_scss" t-att-checked="widget.options.includeAllSCSS ? 'checked' : undefined"/><span/>
+                <div class="custom-control custom-checkbox">
+                    <input type="checkbox" id="o_ace_view_editor_include_all_scss"
+                        class="custom-control-input js_include_all_scss"
+                        t-att-checked="widget.options.includeAllSCSS ? 'checked' : undefined"/>
+                    <label for="o_ace_view_editor_include_all_scss"
+                        class="custom-control-label">Include All SCSS Files</label>
                 </div>
-                Include All SCSS Files
             </label>
             <div class="o_button_section">
                 <button data-action="save" type="submit" class="btn btn-primary">Save</button>
-- 
cgit v1.2.3


From d48b8593dde7c6adf679359e2dd64dee288e9544 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Fri, 25 May 2018 17:00:00 +0200
Subject: [REF] *: BS4, 'pull-left/right' -> 'float-left/right'

---
 addons/web_editor/static/src/xml/ace.xml     | 2 +-
 addons/web_editor/static/src/xml/backend.xml | 2 +-
 addons/web_editor/static/src/xml/editor.xml  | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'addons/web_editor/static/src/xml')

diff --git a/addons/web_editor/static/src/xml/ace.xml b/addons/web_editor/static/src/xml/ace.xml
index c78ce8a4d4a..09fb99f52f8 100644
--- a/addons/web_editor/static/src/xml/ace.xml
+++ b/addons/web_editor/static/src/xml/ace.xml
@@ -38,7 +38,7 @@
         </div>
         <div id="ace-view-id">
             <span/>
-            <div class="pull-right">
+            <div class="float-right">
                 <button data-action="reset" type="button" class="btn btn-xs btn-danger"><i class="fa fa-undo"/> Reset</button>
                 <button data-action="format" type="button" class="btn btn-xs btn-link">Format</button>
             </div>
diff --git a/addons/web_editor/static/src/xml/backend.xml b/addons/web_editor/static/src/xml/backend.xml
index c4666a1aa96..146d96fe1e5 100644
--- a/addons/web_editor/static/src/xml/backend.xml
+++ b/addons/web_editor/static/src/xml/backend.xml
@@ -8,7 +8,7 @@
     </t>
 
     <t t-name="web_editor.FieldTextHtml.button.translate">
-        <div class="btn-group pull-right">
+        <div class="btn-group float-right">
             <button t-if="widget.field.translate" class="o_field_translate btn btn-secondary" style="height: 24px; padding: 1px 17px 0px 5px" aria-label="Translate" title="Translate">
                 <span class="fa fa-language fa-lg oe_input_icon"/>
             </button>
diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index b5f4dff8a3f..8659f354aee 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -51,7 +51,7 @@
             <li class="nav-item"><a role="tab" href="#editor-media-document" aria-controls="editor-media-document" data-toggle="tab" t-attf-class="nav-link#{widget.noDocuments ? ' d-none' : ''}">Document</a></li>
             <li class="nav-item"><a role="tab" href="#editor-media-icon" aria-controls="editor-media-icon" data-toggle="tab" t-attf-class="nav-link#{widget.noIcons ? ' d-none' : ''}">Pictogram</a></li>
             <li class="nav-item"><a role="tab" href="#editor-media-video" aria-controls="editor-media-video" data-toggle="tab" t-attf-class="nav-link#{widget.noVideos ? ' d-none' : ''}">Video</a></li>
-            <li class="nav-item search pull-right">
+            <li class="nav-item search float-right">
                 <ul class="pager mb0 mt0">
                     <li class="previous">
                         <a role="button" class="btn btn-secondary disabled" href="#"><i class="fa fa-angle-left"/>&#32;Previous</a>
@@ -61,7 +61,7 @@
                     </li>
                 </ul>
             </li>
-            <li class="nav-item search pull-right">
+            <li class="nav-item search float-right">
                 <div class="form-group">
                     <input class="form-control" id="icon-search" type="search"/>
                     <span class="fa fa-search" title="Search" role="img" aria-label="Search"/>
@@ -90,7 +90,7 @@
             <input t-if="widget.options.res_model" type="hidden" name="res_model" t-att-value="widget.options.res_model"/>
             <div class="card">
                 <div class="card-body">
-                    <div class="form-group pull-left">
+                    <div class="form-group float-left">
                         <input type="file" class="d-none" name="upload" t-att-accept="widget.accept" multiple="multiple"/>
                         <input type="hidden" name="disable_optimization" value=""/>
                         <div class="btn-group">
@@ -108,7 +108,7 @@
                     <span class="text-muted">— or —</span>
                     <label for="imageurl">Add an image URL</label>
                     <div class="form-group btn-group">
-                        <input type="text" class="form-control url pull-left" id="imageurl" name="url" placeholder="https://www.odoo.com/logo.png" style="width: 250px;"/>
+                        <input type="text" class="form-control url float-left" id="imageurl" name="url" placeholder="https://www.odoo.com/logo.png" style="width: 250px;"/>
                         <button type="button" class="btn btn-secondary o_upload_image_url_button" disabled="disabled">Add</button>
                     </div>
                 </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/web_editor/static/src/xml/ace.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/web_editor/static/src/xml')

diff --git a/addons/web_editor/static/src/xml/ace.xml b/addons/web_editor/static/src/xml/ace.xml
index 09fb99f52f8..1d59a94c827 100644
--- a/addons/web_editor/static/src/xml/ace.xml
+++ b/addons/web_editor/static/src/xml/ace.xml
@@ -39,8 +39,8 @@
         <div id="ace-view-id">
             <span/>
             <div class="float-right">
-                <button data-action="reset" type="button" class="btn btn-xs btn-danger"><i class="fa fa-undo"/> Reset</button>
-                <button data-action="format" type="button" class="btn btn-xs btn-link">Format</button>
+                <button data-action="reset" type="button" class="btn btn-sm btn-danger"><i class="fa fa-undo"/> Reset</button>
+                <button data-action="format" type="button" class="btn btn-sm btn-link">Format</button>
             </div>
         </div>
         <div id="ace-view-editor"/>
-- 
cgit v1.2.3


From cd3f5bbfda76da75a9c7528144020c7dfbdf81d3 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Fri, 8 Jun 2018 12:11:56 +0200
Subject: [REF] web_editor: BS4, review media dialog layout

---
 addons/web_editor/static/src/xml/editor.xml | 42 +++++++++++++----------------
 1 file changed, 19 insertions(+), 23 deletions(-)

(limited to 'addons/web_editor/static/src/xml')

diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index 8659f354aee..7bac85692e2 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -47,30 +47,26 @@
     <!-- Media Dialog (allows to choose an img/pictogram/video) -->
     <div t-name="web_editor.dialog.media">
         <ul class="nav nav-tabs" role="tablist">
-            <li class="nav-item"><a role="tab" href="#editor-media-image" aria-controls="editor-media-image" data-toggle="tab" t-attf-class="nav-link active#{widget.noImages ? ' d-none' : ''}">Image</a></li>
+            <li class="nav-item"><a role="tab" href="#editor-media-image" aria-controls="editor-media-image" data-toggle="tab" t-attf-class="nav-link#{widget.noImages ? ' d-none' : ''}">Image</a></li>
             <li class="nav-item"><a role="tab" href="#editor-media-document" aria-controls="editor-media-document" data-toggle="tab" t-attf-class="nav-link#{widget.noDocuments ? ' d-none' : ''}">Document</a></li>
             <li class="nav-item"><a role="tab" href="#editor-media-icon" aria-controls="editor-media-icon" data-toggle="tab" t-attf-class="nav-link#{widget.noIcons ? ' d-none' : ''}">Pictogram</a></li>
             <li class="nav-item"><a role="tab" href="#editor-media-video" aria-controls="editor-media-video" data-toggle="tab" t-attf-class="nav-link#{widget.noVideos ? ' d-none' : ''}">Video</a></li>
-            <li class="nav-item search float-right">
-                <ul class="pager mb0 mt0">
-                    <li class="previous">
-                        <a role="button" class="btn btn-secondary disabled" href="#"><i class="fa fa-angle-left"/>&#32;Previous</a>
-                    </li>
-                    <li class="next">
-                        <a role="button" class="btn btn-secondary disabled" href="#">Next&#32;<i class="fa fa-angle-right"/></a>
-                    </li>
-                </ul>
-            </li>
-            <li class="nav-item search float-right">
+            <li class="nav-item ml-auto search">
                 <div class="form-group">
                     <input class="form-control" id="icon-search" type="search"/>
                     <span class="fa fa-search" title="Search" role="img" aria-label="Search"/>
                 </div>
             </li>
+            <li class="nav-item search">
+                <div class="btn-group">
+                    <a role="button" class="btn btn-secondary disabled previous" href="#"><i class="fa fa-angle-left"/>&#32;Previous</a>
+                    <a role="button" class="btn btn-secondary disabled next" href="#">Next&#32;<i class="fa fa-angle-right"/></a>
+                </div>
+            </li>
         </ul>
         <!-- Tab panes -->
         <div class="tab-content">
-            <div role="tabpanel" class="tab-pane fade in active" id="editor-media-image"/>
+            <div role="tabpanel" class="tab-pane fade" id="editor-media-image"/>
             <div role="tabpanel" class="tab-pane fade" id="editor-media-document"/>
             <div role="tabpanel" class="tab-pane fade" id="editor-media-icon"/>
             <div role="tabpanel" class="tab-pane fade" id="editor-media-video"/>
@@ -90,26 +86,26 @@
             <input t-if="widget.options.res_model" type="hidden" name="res_model" t-att-value="widget.options.res_model"/>
             <div class="card">
                 <div class="card-body">
-                    <div class="form-group float-left">
+                    <div class="form-inline">
                         <input type="file" class="d-none" name="upload" t-att-accept="widget.accept" multiple="multiple"/>
                         <input type="hidden" name="disable_optimization" value=""/>
                         <div class="btn-group">
                             <button class="btn btn-primary o_upload_image_button" type="button">Upload an image</button>
-                            <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown" type="button">
+                            <button class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" type="button">
                                 <span class="sr-only">Alternate Upload</span>
                             </button>
                             <div class="dropdown-menu" role="menu">
                                 <a role="menuitem" class="dropdown-item o_upload_image_button_no_optimization">Upload image without optimization</a>
                             </div>
                         </div>
-                    </div>
-                </div>
-                <div>
-                    <span class="text-muted">— or —</span>
-                    <label for="imageurl">Add an image URL</label>
-                    <div class="form-group btn-group">
-                        <input type="text" class="form-control url float-left" id="imageurl" name="url" placeholder="https://www.odoo.com/logo.png" style="width: 250px;"/>
-                        <button type="button" class="btn btn-secondary o_upload_image_url_button" disabled="disabled">Add</button>
+                        <span class="text-muted">— or —</span>
+                        <label for="imageurl">Add an image URL</label>
+                        <div class="input-group">
+                            <input type="text" class="form-control url" id="imageurl" name="url" placeholder="https://www.odoo.com/logo.png" style="width: 250px;"/>
+                            <div class="input-group-append">
+                                <button type="button" class="btn btn-secondary o_upload_image_url_button" disabled="disabled">Add</button>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
-- 
cgit v1.2.3


From 702499430fef35b7faede1ef5c9ca4d611287836 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 12 Jul 2018 14:44:53 +0200
Subject: [REF] web_editor, website: BS4, adapt website UI

---
 addons/web_editor/static/src/xml/snippets.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web_editor/static/src/xml')

diff --git a/addons/web_editor/static/src/xml/snippets.xml b/addons/web_editor/static/src/xml/snippets.xml
index a0c35288b93..93fc31c7de9 100644
--- a/addons/web_editor/static/src/xml/snippets.xml
+++ b/addons/web_editor/static/src/xml/snippets.xml
@@ -32,7 +32,7 @@
             </div>
         </div>
         <div class="o_colorpicker_sections">
-            <ul class="nav nav-pills o_colorpicker_section_menu"/>
+            <ul class="nav nav-pills flex-column o_colorpicker_section_menu"/>
             <div class="tab-content o_colorpicker_section_tabs"/>
         </div>
     </div>
-- 
cgit v1.2.3