diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-10-26 14:13:41 +0000 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-10-26 14:13:41 +0000 |
| commit | 1f37ec3b0b009b8dfd679a58bb68eb9d138c6e02 (patch) | |
| tree | 2370a5a75d79e04469e1bbc99e2fb094fb55e9cd | |
| parent | 8c756a32a0c20b8ea8efb556b25eaa1fcaaab7bc (diff) | |
[REF] account, hr_org_chart: use correct sub-assets
Some variables were placed at the beginning of the backend helper.
While it was working, the normal convention is to place them at the
end of the variables helper.
closes odoo/odoo#28203
| -rw-r--r-- | addons/account/static/src/scss/variables.scss | 10 | ||||
| -rw-r--r-- | addons/account/views/account.xml | 4 | ||||
| -rw-r--r-- | addons/hr_org_chart/static/src/scss/variables.scss | 12 | ||||
| -rw-r--r-- | addons/hr_org_chart/views/hr_templates.xml | 4 |
4 files changed, 15 insertions, 15 deletions
diff --git a/addons/account/static/src/scss/variables.scss b/addons/account/static/src/scss/variables.scss index b83890b01a1..72a0a315181 100644 --- a/addons/account/static/src/scss/variables.scss +++ b/addons/account/static/src/scss/variables.scss @@ -1,5 +1,5 @@ -$o-account-action-col-width: 15px !default; -$o-account-main-table-borders-padding: 3px !default; -$o-account-light-border: 1px solid #bbb !default; -$o-account-initial-line-background: #f0f0f0 !default; -$o-account-info-color: #44c !default; +$o-account-action-col-width: 15px; +$o-account-main-table-borders-padding: 3px; +$o-account-light-border: 1px solid #bbb; +$o-account-initial-line-background: #f0f0f0; +$o-account-info-color: #44c; diff --git a/addons/account/views/account.xml b/addons/account/views/account.xml index bba2ec420a1..57539d4f6a1 100644 --- a/addons/account/views/account.xml +++ b/addons/account/views/account.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> - <template id="_assets_backend_helpers" inherit_id="web._assets_backend_helpers"> - <xpath expr="//link" position="before"> + <template id="_assets_primary_variables" inherit_id="web._assets_primary_variables"> + <xpath expr="//link[last()]" position="after"> <link rel="stylesheet" type="text/scss" href="/account/static/src/scss/variables.scss"/> </xpath> </template> diff --git a/addons/hr_org_chart/static/src/scss/variables.scss b/addons/hr_org_chart/static/src/scss/variables.scss index 9abf85776b3..142ebf9ab46 100644 --- a/addons/hr_org_chart/static/src/scss/variables.scss +++ b/addons/hr_org_chart/static/src/scss/variables.scss @@ -1,10 +1,10 @@ -$o-hr-org-chart-bg: white !default; -$o-hr-org-chart-border-color: $o-brand-secondary !default; +$o-hr-org-chart-bg: white; +$o-hr-org-chart-border-color: $o-brand-secondary; -$o-hr-org-chart-entry-v-gap: 6px !default; -$o-hr-org-chart-entry-pic-size: 46px !default; -$o-hr-org-chart-entry-line-w: 1px !default; -$o-hr-org-chart-entry-border-color: darken($o-hr-org-chart-bg, 25%) !default; +$o-hr-org-chart-entry-v-gap: 6px; +$o-hr-org-chart-entry-pic-size: 46px; +$o-hr-org-chart-entry-line-w: 1px; +$o-hr-org-chart-entry-border-color: darken($o-hr-org-chart-bg, 25%); // MIXINS @mixin o-hr-org-chart-line { diff --git a/addons/hr_org_chart/views/hr_templates.xml b/addons/hr_org_chart/views/hr_templates.xml index b7ed3215ae8..5ee5e9e753b 100644 --- a/addons/hr_org_chart/views/hr_templates.xml +++ b/addons/hr_org_chart/views/hr_templates.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> - <template id="_assets_backend_helpers" inherit_id="web._assets_backend_helpers"> - <xpath expr="//link" position="before"> + <template id="_assets_primary_variables" inherit_id="web._assets_primary_variables"> + <xpath expr="//link[last()]" position="after"> <link rel="stylesheet" type="text/scss" href="/hr_org_chart/static/src/scss/variables.scss"/> </xpath> </template> |