From aa24a2cad4b0ce3ff063bdca637753f7ae15d468 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Tue, 28 Aug 2018 18:24:28 +0200
Subject: [PATCH] [FIX] website: use variables for boxed layout option

- More efficient
- Needed for theme migration
---
 .../src/scss/options/layout/option_layout_boxed.scss   |  6 ------
 .../options/layout/option_layout_boxed_variables.scss  |  1 +
 addons/website/static/src/scss/primary_variables.scss  |  1 +
 addons/website/static/src/scss/website.scss            |  6 ++++++
 addons/website/views/website_templates.xml             | 10 +++++-----
 5 files changed, 13 insertions(+), 11 deletions(-)
 delete mode 100644 addons/website/static/src/scss/options/layout/option_layout_boxed.scss
 create mode 100644 addons/website/static/src/scss/options/layout/option_layout_boxed_variables.scss

diff --git a/addons/website/static/src/scss/options/layout/option_layout_boxed.scss b/addons/website/static/src/scss/options/layout/option_layout_boxed.scss
deleted file mode 100644
index 6463f5a5aa3..00000000000
--- a/addons/website/static/src/scss/options/layout/option_layout_boxed.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-
-@include media-breakpoint-up(md) {
-    #wrapwrap {
-        padding: 0 7.5%;
-    }
-}
diff --git a/addons/website/static/src/scss/options/layout/option_layout_boxed_variables.scss b/addons/website/static/src/scss/options/layout/option_layout_boxed_variables.scss
new file mode 100644
index 00000000000..9251dde4fa7
--- /dev/null
+++ b/addons/website/static/src/scss/options/layout/option_layout_boxed_variables.scss
@@ -0,0 +1 @@
+$o-theme-layout: 'boxed';
diff --git a/addons/website/static/src/scss/primary_variables.scss b/addons/website/static/src/scss/primary_variables.scss
index 58ad01a6989..2b6aedf7d3a 100644
--- a/addons/website/static/src/scss/primary_variables.scss
+++ b/addons/website/static/src/scss/primary_variables.scss
@@ -1,3 +1,4 @@
+$o-theme-layout: 'full';
 
 //------------------------------------------------------------------------------
 // Colors
diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss
index 9dd6b04b8f5..c061370e61a 100644
--- a/addons/website/static/src/scss/website.scss
+++ b/addons/website/static/src/scss/website.scss
@@ -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 {
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 599a383057b..0f00be3301c 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -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>