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

[FIX] web,website: bundle utils.less to assets fronted

Browse Source
This commit is contained in:
Aaron Bohy
2015-10-01 14:00:19 +02:00
committed by Géry Debongnie
parent 6ea633ee62
commit de024f43ab
4 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/less/enterprise_compatibility.less
-19
View File
@@ -8,27 +8,8 @@
// The problem is that we have two web clients in parallel, and every
// addons should behave properly with both.
@odoo-brand-primary: #337ab7;
@odoo-brand-optional: @odoo-brand-primary;
@odoo-brand-secondary: #8f8f8f;
@odoo-brand-lightsecondary: #e2e2e0;
@odoo-list-grey: @odoo-brand-lightsecondary; // FIXME: listview thead background color
@odoo-webclient-background-color: #F0EEEE;
@odoo-view-background-color: white;
@odoo-shadow-color: #303030;
@brand-primary: @odoo-brand-primary;
@odoo-font-size-base: 13px;
@odoo-font-size-base-touch: 15px;
@odoo-main-text-color: #555555;
@odoo-main-color-muted: #a8a8a8;
@odoo-form-group-cols: 12;
@odoo-horizontal-padding: 16px;
@screen-xs-min: 475px;
@screen-xxs-max: (@screen-xs-min - 1);
.oe-view-manager {
background-color: @odoo-webclient-background-color !important;
}
addons/web/static/src/less/variables.less
+19
View File
@@ -0,0 +1,19 @@
@odoo-brand-primary: #337ab7;
@odoo-brand-optional: @odoo-brand-primary;
@odoo-brand-secondary: #8f8f8f;
@odoo-brand-lightsecondary: #e2e2e0;
@odoo-list-grey: @odoo-brand-lightsecondary; // FIXME: listview thead background color
@odoo-webclient-background-color: #F0EEEE;
@odoo-view-background-color: white;
@odoo-shadow-color: #303030;
@odoo-font-size-base: 13px;
@odoo-font-size-base-touch: 15px;
@odoo-main-text-color: #555555;
@odoo-main-color-muted: #a8a8a8;
@odoo-form-group-cols: 12;
@odoo-horizontal-padding: 16px;
@screen-xs-min: 475px;
@screen-xxs-max: (@screen-xs-min - 1);
addons/web/views/webclient_templates.xml
+1
View File
@@ -101,6 +101,7 @@
<link rel="stylesheet" href="/base/static/src/css/modules.css"/>
<link rel="stylesheet" href='/website/static/src/less/import_bootstrap.less'/>
<link rel="stylesheet" href="/web/static/src/less/variables.less"/>
<link rel="stylesheet" href="/web/static/src/less/enterprise_compatibility.less"/>
<link rel="stylesheet" href="/web/static/src/less/utils.less"/>
<link rel="stylesheet" href="/web/static/src/less/modal.less"/>
addons/website/views/website_templates.xml
+3
View File
@@ -22,6 +22,9 @@
<script type="text/javascript" src="/website/static/src/js/website.snippets.animation.js"></script>
<t t-call="web.bootstrap"/>
<link rel="stylesheet" href="/web/static/src/less/variables.less"/>
<link rel="stylesheet" href="/web/static/src/less/utils.less"/>
</template>
<template id="assets_backend" name="website assets for backend" inherit_id="web.assets_backend">