diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-05-14 17:15:12 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:36:54 +0200 |
| commit | 66289d639c80780fe01b514296ea6b86a63afba3 (patch) | |
| tree | 8e0fb5f226da13eb3a776f1a283ed5a8fe5d85c1 /addons/web/static/src | |
| parent | 318b10cce467fea7bd5f16564ed5218c5f3d0a48 (diff) | |
[REF] *: BS4, review breadcrumb structure
Now, the 'breadcrumb-item' class has to be put explicitely on
breadcrumb items.
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/chrome/control_panel.js | 7 | ||||
| -rw-r--r-- | addons/web/static/src/scss/bootstrap_overridden.scss | 1 | ||||
| -rw-r--r-- | addons/web/static/src/scss/control_panel.scss | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/addons/web/static/src/js/chrome/control_panel.js b/addons/web/static/src/js/chrome/control_panel.js index 0913b574a3d..fb265390f51 100644 --- a/addons/web/static/src/js/chrome/control_panel.js +++ b/addons/web/static/src/js/chrome/control_panel.js @@ -245,11 +245,12 @@ var ControlPanel = Widget.extend({ var self = this; var is_last = (index === length-1); var li_content = bc.title && _.escape(bc.title.trim()) || data.noDisplayContent; - var $bc = $('<li>') - .append(is_last ? li_content : $('<a>').html(li_content)) + var $bc = $('<li>', {class: 'breadcrumb-item'}) + .append(is_last ? li_content : $('<a>', {href: '#'}).html(li_content)) .toggleClass('active', is_last); if (!is_last) { - $bc.click(function () { + $bc.click(function (ev) { + ev.preventDefault(); self.trigger_up('breadcrumb_clicked', {controllerID: bc.controllerID}); }); } diff --git a/addons/web/static/src/scss/bootstrap_overridden.scss b/addons/web/static/src/scss/bootstrap_overridden.scss index 15dff6c2f51..8d0cf644b62 100644 --- a/addons/web/static/src/scss/bootstrap_overridden.scss +++ b/addons/web/static/src/scss/bootstrap_overridden.scss @@ -131,6 +131,7 @@ $modal-md: 650px; $breadcrumb-padding-y: 0; $breadcrumb-padding-x: 0; +$breadcrumb-margin-bottom: 0; $breadcrumb-bg: $o-control-panel-background-color; // FIXME $breadcrumb-color ? diff --git a/addons/web/static/src/scss/control_panel.scss b/addons/web/static/src/scss/control_panel.scss index 144b5f7bbde..195773e1b12 100644 --- a/addons/web/static/src/scss/control_panel.scss +++ b/addons/web/static/src/scss/control_panel.scss @@ -8,7 +8,6 @@ > .breadcrumb { width: 50%; - margin: 0px; font-size: 18px; > li { |