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

[IMP] website: reorganise secondary_variables.scss file

Browse Source 
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>
This commit is contained in:
qsm-odoo
2020-05-31 13:37:25 +00:00
parent 930b1d00d4
commit d345bc4df7
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/scss/secondary_variables.scss
+21 -17
View File
@@ -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') {