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

[FIX] website: use variables for boxed layout option

Browse Source 
- More efficient
- Needed for theme migration
This commit is contained in:
qsm-odoo
2018-08-30 11:10:56 +02:00
parent 77402a4efc
commit aa24a2cad4
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/scss/options/layout/option_layout_boxed.scss
-6
View File
@@ -1,6 +0,0 @@
@include media-breakpoint-up(md) {
#wrapwrap {
padding: 0 7.5%;
}
}
addons/website/static/src/scss/options/layout/option_layout_boxed_variables.scss
+1
View File
@@ -0,0 +1 @@
$o-theme-layout: 'boxed';
addons/website/static/src/scss/primary_variables.scss
+1
View File
@@ -1,3 +1,4 @@
$o-theme-layout: 'full';
//------------------------------------------------------------------------------
// Colors
addons/website/static/src/scss/website.scss
+6
View File
@@ -18,6 +18,12 @@ $-theme-font: nth($o-theme-font-urls, $o-theme-font-number);
background-repeat: no-repeat;
background-position: center;
background-attachment: fixed;
@if ($o-theme-layout == 'boxed') {
@include media-breakpoint-up(md) {
padding: 0 7.5%;
}
}
}
.navbar {
addons/website/views/website_templates.xml
+5 -5
View File
@@ -469,8 +469,8 @@
</list>
<more data-depends="">
<list string="Body">
<opt string="Full" data-xmlid="website.option_layout_full" data-enable="option_no_background" data-icon="/website/static/src/img/options/layout-full.png"/>
<opt id="option_layout_boxed" string="Boxed" data-xmlid="website.option_layout_boxed" data-icon="/website/static/src/img/options/layout-boxed.png"/>
<opt string="Full" data-xmlid="website.option_layout_full_variables" data-enable="option_no_background" data-icon="/website/static/src/img/options/layout-full.png"/>
<opt id="option_layout_boxed" string="Boxed" data-xmlid="website.option_layout_boxed_variables" data-icon="/website/static/src/img/options/layout-boxed.png"/>
</list>
<list string="Background" data-depends="option_layout_boxed">
<opt id="option_no_background" string="None" data-xmlid=""/>
@@ -524,12 +524,12 @@
</template>
<!-- Layout options -->
<template id="option_layout_full" inherit_id="website.assets_frontend" active="True">
<template id="option_layout_full_variables" inherit_id="website._assets_primary_variables" active="True">
<xpath expr="//link[last()]" position="after"/>
</template>
<template id="option_layout_boxed" inherit_id="website.assets_frontend" active="False">
<template id="option_layout_boxed_variables" inherit_id="website._assets_primary_variables" active="False">
<xpath expr="//link[last()]" position="after">
<link rel="stylesheet" type="text/scss" href="/website/static/src/scss/options/layout/option_layout_boxed.scss"/>
<link rel="stylesheet" type="text/scss" href="/website/static/src/scss/options/layout/option_layout_boxed_variables.scss"/>
</xpath>
</template>