diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-07-26 11:32:43 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-07-26 11:32:43 +0200 |
| commit | e0f9c092ccefc0516d06a9dc7f66e650eee888cf (patch) | |
| tree | 0c404769dc28af133425cf9756a83569c70b31f3 /addons/web/static/src | |
| parent | 7d78795f8b34bc6a8afde18427a1c26901824db3 (diff) | |
| parent | 1d6d790513e3f1177dc0059f2ba4a06de6d87ac2 (diff) | |
[MERGE] forward port branch saas-12.2 up to 1d6d790513e
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views/pivot/pivot_model.js | 1 | ||||
| -rw-r--r-- | addons/web/static/src/scss/layout_standard.scss | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/addons/web/static/src/js/views/pivot/pivot_model.js b/addons/web/static/src/js/views/pivot/pivot_model.js index 04f818d825d..ea657cbe2a6 100644 --- a/addons/web/static/src/js/views/pivot/pivot_model.js +++ b/addons/web/static/src/js/views/pivot/pivot_model.js @@ -430,6 +430,7 @@ var PivotModel = AbstractModel.extend({ } if ('domain' in params) { this.data.domain = params.domain; + this.initialDomain = params.domain; } else { this.data.domain = this.initialDomain; } diff --git a/addons/web/static/src/scss/layout_standard.scss b/addons/web/static/src/scss/layout_standard.scss index acc0e07bf1c..bd0b4934259 100644 --- a/addons/web/static/src/scss/layout_standard.scss +++ b/addons/web/static/src/scss/layout_standard.scss @@ -1,3 +1,6 @@ .o_standard_footer { margin-top: 200px; + .list-inline-item { + white-space: nowrap; + } } |