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/website/static/src | |
| 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/website/static/src')
| -rw-r--r-- | addons/website/static/src/js/editor/snippets.options.js | 8 | ||||
| -rw-r--r-- | addons/website/static/src/scss/website.scss | 12 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.seo.xml | 6 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.xml | 18 |
4 files changed, 23 insertions, 21 deletions
diff --git a/addons/website/static/src/js/editor/snippets.options.js b/addons/website/static/src/js/editor/snippets.options.js index c71afc1085f..14f1b6f0a4f 100644 --- a/addons/website/static/src/js/editor/snippets.options.js +++ b/addons/website/static/src/js/editor/snippets.options.js @@ -758,7 +758,7 @@ options.registry.collapse = options.Class.extend({ */ onClone: function () { this.$target.find('[data-toggle="collapse"]').removeAttr('data-target').removeData('target'); - this.$target.find('.panel-collapse').removeAttr('id'); + this.$target.find('.collapse').removeAttr('id'); this._createIDs(); }, /** @@ -766,9 +766,9 @@ options.registry.collapse = options.Class.extend({ */ onMove: function () { this._createIDs(); - var $panel = this.$target.find('.panel-collapse').removeData('bs.collapse'); + var $panel = this.$target.find('.collapse').removeData('bs.collapse'); if ($panel.attr('aria-expanded') === 'true') { - $panel.closest('.panel-group').find('.panel-collapse[aria-expanded="true"]') + $panel.closest('.accordion').find('.collapse[aria-expanded="true"]') .filter(function () {return this !== $panel[0];}) .collapse('hide') .one('hidden.bs.collapse', function () { @@ -791,7 +791,7 @@ options.registry.collapse = options.Class.extend({ var $tab = this.$target.find('[data-toggle="collapse"]'); // link to the parent group - var $tablist = this.$target.closest('.panel-group'); + var $tablist = this.$target.closest('.accordion'); var tablist_id = $tablist.attr('id'); if (!tablist_id) { tablist_id = 'myCollapse' + time; diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss index 9076e9565ca..406b25e2e24 100644 --- a/addons/website/static/src/scss/website.scss +++ b/addons/website/static/src/scss/website.scss @@ -112,11 +112,11 @@ table.table_desc tr td { overflow: auto; } -.s_comparisons .panel .list-group-item:not(.active) { +.s_comparisons .card .list-group-item:not(.active) { color: #666; } .s_comparisons { - .panel small { + .card small { color: inherit; } .text-muted { @@ -124,13 +124,13 @@ table.table_desc tr td { } } -.s_faq_collapse .container .panel { +.s_faq_collapse .container .card { background-color: inherit; border : 1px solid rgba(0, 0, 0, 0.15); - .panel-body { + .card-body { border-top: none; - border-bottom-left-radius: ($panel-border-radius - 1); - border-bottom-right-radius: ($panel-border-radius - 1); + border-bottom-left-radius: ($card-border-radius - 1); + border-bottom-right-radius: ($card-border-radius - 1); } } diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml index 266dbe380ff..dd6decda977 100644 --- a/addons/website/static/src/xml/website.seo.xml +++ b/addons/website/static/src/xml/website.seo.xml @@ -26,9 +26,9 @@ </div> <div class="col-lg-6"> <h5 class="mt16">Preview <small>how your page will be listed on Google</small></h5> - <div class="well"> - <div class="panel mb0"> - <div class="panel-body"> + <div> + <div class="card mb0"> + <div class="card-body"> <div class="js_seo_preview"/> </div> </div> diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml index ca97d0a6eb1..72036f9217b 100644 --- a/addons/website/static/src/xml/website.xml +++ b/addons/website/static/src/xml/website.xml @@ -62,15 +62,17 @@ </div> <div t-name="website.rename_page"> - <div class="well"> - <form class="form-horizontal"> - <div class="form-group mb0"> - <label for="new_name" class="control-label col-md-4">Rename Page To:</label> - <div class="col-md-8"> - <input type="text" class="form-control" id="new_name" placeholder="e.g. About Us"/> + <div class="card"> + <div class="card-body"> + <form class="form-horizontal"> + <div class="form-group mb0"> + <label for="new_name" class="control-label col-md-4">Rename Page To:</label> + <div class="col-md-8"> + <input type="text" class="form-control" id="new_name" placeholder="e.g. About Us"/> + </div> </div> - </div> - </form> + </form> + </div> </div> <t t-call="website.dependencies"/> </div> |
