From d345bc4df776e69b0e91a74ce296ef74291190bc Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 28 May 2020 10:04:32 +0000
Subject: [PATCH] [IMP] website: reorganise secondary_variables.scss file

Future changes will require a different order of the code in that file.
This commit only reorganises the file to make future code review easier.

Part of https://github.com/odoo/odoo/pull/52211
Related to task-2197038

closes odoo/odoo#52211

Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
---
 .../static/src/scss/secondary_variables.scss  | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/addons/website/static/src/scss/secondary_variables.scss b/addons/website/static/src/scss/secondary_variables.scss
index 55018529daa..68094734a72 100644
--- a/addons/website/static/src/scss/secondary_variables.scss
+++ b/addons/website/static/src/scss/secondary_variables.scss
@@ -1,4 +1,24 @@
 
+//------------------------------------------------------------------------------
+// Website customizations
+//------------------------------------------------------------------------------
+
+// By default, most website palette values are null. Each null value is
+// automatically replaced with corresponsing values in chosen default values
+// palette.
+$-website-values-default: nth($o-website-values-palettes, $o-website-values-palette-number);
+$-actual-user-website-values-palette: map-merge($-website-values-default, o-map-omit($o-user-website-values));
+$o-website-values-palettes: append($o-website-values-palettes, $-actual-user-website-values-palette);
+
+// Enable last website values palette, which is now the user customized one
+$o-website-values-palette-number: length($o-website-values-palettes);
+
+$o-website-values: nth($o-website-values-palettes, $o-website-values-palette-number) !default;
+$o-website-values: map-merge($o-base-website-values-palette, o-map-omit($o-website-values));
+@function o-website-value($key) {
+    @return map-get($o-website-values, $key);
+}
+
 //------------------------------------------------------------------------------
 // Colors
 //------------------------------------------------------------------------------
@@ -48,25 +68,9 @@ $o-color-palette-number: length($o-color-palettes);
 $o-theme-color-palette-number: length($o-theme-color-palettes);
 
 //------------------------------------------------------------------------------
-// Website customizations
+// Fonts
 //------------------------------------------------------------------------------
 
-// By default, most website palette values are null. Each null value is
-// automatically replaced with corresponsing values in chosen default values
-// palette.
-$-website-values-default: nth($o-website-values-palettes, $o-website-values-palette-number);
-$-actual-user-website-values-palette: map-merge($-website-values-default, o-map-omit($o-user-website-values));
-$o-website-values-palettes: append($o-website-values-palettes, $-actual-user-website-values-palette);
-
-// Enable last website values palette, which is now the user customized one
-$o-website-values-palette-number: length($o-website-values-palettes);
-
-$o-website-values: nth($o-website-values-palettes, $o-website-values-palette-number) !default;
-$o-website-values: map-merge($o-base-website-values-palette, o-map-omit($o-website-values));
-@function o-website-value($key) {
-    @return map-get($o-website-values, $key);
-}
-
 @if o-website-value('google-fonts') {
     $o-theme-font-names: join($o-theme-font-names, o-website-value('google-fonts'));
     @each $font in o-website-value('google-fonts') {