diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:42:10 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:42:10 +0200 |
| commit | 2b3017974bc7cd4b3a74f83c956224cfe4e5a918 (patch) | |
| tree | ff6aab8dc6bfa7afbe9ef714ca157ebc0185d2fd /addons/web_editor/static/src/xml/ace.xml | |
| parent | 8ed8b46f6434a2a3adea69e0134317e30bf9b936 (diff) | |
| parent | 519594e9cab9a6362ef7c3e911605e4507a0a008 (diff) | |
[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
Diffstat (limited to 'addons/web_editor/static/src/xml/ace.xml')
| -rw-r--r-- | addons/web_editor/static/src/xml/ace.xml | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/addons/web_editor/static/src/xml/ace.xml b/addons/web_editor/static/src/xml/ace.xml index de713540a67..1d59a94c827 100644 --- a/addons/web_editor/static/src/xml/ace.xml +++ b/addons/web_editor/static/src/xml/ace.xml @@ -5,36 +5,42 @@ <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> - <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> + <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown">XML (HTML)</button> + <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 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 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 hidden"> - <div class="o_checkbox"> - <input type="checkbox" class="js_include_all_scss" t-att-checked="widget.options.includeAllSCSS ? 'checked' : undefined"/><span/> + <label class="o_include_option o_include_all_scss d-none"> + <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-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-secondary">Close</button> </div> </div> <div id="ace-view-id"> <span/> - <div class="pull-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 class="float-right"> + <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"/> |