From a8fec3b5cdc57852fd99011fe75cb4081f49ed96 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 6 Dec 2018 13:24:11 +0000
Subject: [PATCH] [IMP] portal, website: change the default website body bg

Use a very very very light gray as body background color for
the website so that default white cards have some contrast with the
body. Also adapt the portal system to use the portal colors when the
body bg color is equal to that very very very light gray (while it was
compared to $white before).

closes odoo/odoo#29318
---
 addons/portal/static/src/scss/bootstrap_overridden.scss  | 6 ++++++
 addons/portal/static/src/scss/portal.scss                | 2 +-
 addons/portal/static/src/scss/primary_variables.scss     | 1 +
 addons/website/static/src/scss/bootstrap_overridden.scss | 4 +++-
 addons/website/static/src/scss/primary_variables.scss    | 2 +-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/addons/portal/static/src/scss/bootstrap_overridden.scss b/addons/portal/static/src/scss/bootstrap_overridden.scss
index 2fc73b519ae..8f129e7bee4 100644
--- a/addons/portal/static/src/scss/bootstrap_overridden.scss
+++ b/addons/portal/static/src/scss/bootstrap_overridden.scss
@@ -3,6 +3,12 @@ $sizes: (
     0: 0,
 );
 
+// Body
+//
+// Settings for the `<body>` element.
+
+$body-bg: $o-portal-default-body-bg;
+
 // Fonts
 //
 // Font, line-height, and color for body text, headings, and more.
diff --git a/addons/portal/static/src/scss/portal.scss b/addons/portal/static/src/scss/portal.scss
index a02e765f6a3..c5a49e59368 100644
--- a/addons/portal/static/src/scss/portal.scss
+++ b/addons/portal/static/src/scss/portal.scss
@@ -21,7 +21,7 @@ $o-portal-table-td-pb: map-get($spacers, 1) !default; // bts4 pb-1
 $o-portal-bg-color: desaturate($gray-200, 100%);
 
 // Check if portal uses default colors
-$o-portal-use-default-colors: $body-bg == $white;
+$o-portal-use-default-colors: $body-bg == $o-portal-default-body-bg;
 
 // Frontend general
 #wrapwrap {
diff --git a/addons/portal/static/src/scss/primary_variables.scss b/addons/portal/static/src/scss/primary_variables.scss
index e69de29bb2d..3bdd824ccb7 100644
--- a/addons/portal/static/src/scss/primary_variables.scss
+++ b/addons/portal/static/src/scss/primary_variables.scss
@@ -0,0 +1 @@
+$o-portal-default-body-bg: #FCFCFC;
diff --git a/addons/website/static/src/scss/bootstrap_overridden.scss b/addons/website/static/src/scss/bootstrap_overridden.scss
index 4dc818b7eea..8c21c748fe1 100644
--- a/addons/website/static/src/scss/bootstrap_overridden.scss
+++ b/addons/website/static/src/scss/bootstrap_overridden.scss
@@ -18,7 +18,9 @@ $yiq-text-dark: if($-is-light, null, color('text'));
 //
 // Settings for the `<body>` element.
 
-$body-bg: color('body');
+@if color('body') { // Do not default to bootstrap but to the portal value
+    $body-bg: color('body');
+}
 $body-color: color('text');
 
 // Fonts
diff --git a/addons/website/static/src/scss/primary_variables.scss b/addons/website/static/src/scss/primary_variables.scss
index 6e3f9a5f39a..752823b7715 100644
--- a/addons/website/static/src/scss/primary_variables.scss
+++ b/addons/website/static/src/scss/primary_variables.scss
@@ -8,7 +8,7 @@ $o-theme-layout: 'full';
 $-palettes: ();
 @each $palette in $o-color-palettes {
     $-palettes: append($-palettes, map-merge((
-        'body': null, // Default to bootstrap
+        'body': $o-portal-default-body-bg,
         'menu': #F9F9F9,
         'footer': #F9F9F9,
         'text': null, // Default to bootstrap