diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-03-15 14:25:57 +0100 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:36:54 +0200 |
| commit | 59237ea81988bdcd0cc746422a7c94bf2eadaaa2 (patch) | |
| tree | 0cc96ceb526949a9b7694ca2c64c4db8a9e9409d /addons/web_editor | |
| parent | ed1b18f10348244ce26b8b27edbd59d91cee7772 (diff) | |
[REF] *: BS4, review panel and well structure
Panels and wells were dropped and replaced by the "Card" component.
Diffstat (limited to 'addons/web_editor')
| -rw-r--r-- | addons/web_editor/static/src/scss/web_editor.ui.scss | 6 | ||||
| -rw-r--r-- | addons/web_editor/static/src/scss/web_editor.variables.scss | 2 | ||||
| -rw-r--r-- | addons/web_editor/static/src/xml/editor.xml | 30 |
3 files changed, 20 insertions, 18 deletions
diff --git a/addons/web_editor/static/src/scss/web_editor.ui.scss b/addons/web_editor/static/src/scss/web_editor.ui.scss index e22d98a9ffb..eb872c432e3 100644 --- a/addons/web_editor/static/src/scss/web_editor.ui.scss +++ b/addons/web_editor/static/src/scss/web_editor.ui.scss @@ -1356,7 +1356,7 @@ body .modal { } } - .well { + .card { border-color: gray('200'); border-top-width: 0; } @@ -1422,7 +1422,7 @@ body .modal { } #editor-media-image, #editor-media-document { - .well { + .card { label { margin: auto 10px; } @@ -1434,7 +1434,7 @@ body .modal { } // VIDEO TAB - #editor-media-video .well { + #editor-media-video .card { padding: 0; display: flex; flex-flow: row wrap; diff --git a/addons/web_editor/static/src/scss/web_editor.variables.scss b/addons/web_editor/static/src/scss/web_editor.variables.scss index 37a24e1b79c..b5472208bff 100644 --- a/addons/web_editor/static/src/scss/web_editor.variables.scss +++ b/addons/web_editor/static/src/scss/web_editor.variables.scss @@ -209,7 +209,7 @@ $o-we-switch-inactive-color: $o-we-color-paper !default; } @mixin o-w-preserve-wells { - .well { + .card { padding: 19px; margin-bottom: 20px; background-color: $o-we-color-paper; 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"> |
