pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] account, hr_org_chart: use correct sub-assets

Browse Source 
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
This commit is contained in:
qsm-odoo
2018-10-26 14:13:41 +00:00
parent 8c756a32a0
commit 1f37ec3b0b
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/static/src/scss/variables.scss
+5 -5
View File
@@ -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;
addons/account/views/account.xml
+2 -2
View File
@@ -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>
addons/hr_org_chart/static/src/scss/variables.scss
+6 -6
View File
@@ -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 {
addons/hr_org_chart/views/hr_templates.xml
+2 -2
View File
@@ -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>