From 0539787e23b02d1ac68eeb9afeb63ecbb3c1c112 Mon Sep 17 00:00:00 2001 From: "stefanorigano (SRI)" Date: Mon, 27 Sep 2021 09:01:13 +0000 Subject: [PATCH] [REF] theme_*: inject theme's preferred palette into ui This commit injects for each theme a "preferred" palette into the website's UI palette list ("Theme" tab). It also removes '$o-palette-priority-prefix' overrides, letting website handling the palettes order. task-2656337 closes odoo/design-themes#504 Related: odoo/odoo#77236 Signed-off-by: Quentin Smetz (qsm) --- theme_anelusia/static/src/scss/primary_variables.scss | 2 +- theme_artists/static/src/scss/primary_variables.scss | 2 +- theme_avantgarde/static/src/scss/primary_variables.scss | 2 +- theme_aviato/static/src/scss/primary_variables.scss | 6 ++++++ theme_beauty/static/src/scss/primary_variables.scss | 2 +- theme_bewise/static/src/scss/primary_variables.scss | 2 +- theme_bistro/static/src/scss/primary_variables.scss | 2 +- theme_bookstore/static/src/scss/primary_variables.scss | 2 +- theme_buzzy/static/src/scss/primary_variables.scss | 4 ++++ theme_clean/static/src/scss/primary_variables.scss | 2 +- theme_cobalt/static/src/scss/primary_variables.scss | 2 +- theme_enark/static/src/scss/primary_variables.scss | 2 +- theme_graphene/static/src/scss/primary_variables.scss | 2 +- theme_kea/static/src/scss/primary_variables.scss | 2 +- theme_kiddo/static/src/scss/primary_variables.scss | 2 +- theme_loftspace/static/src/scss/primary_variables.scss | 2 +- theme_monglia/static/src/scss/primary_variables.scss | 2 +- theme_nano/static/src/scss/primary_variables.scss | 2 +- theme_notes/static/src/scss/primary_variables.scss | 2 +- theme_orchid/static/src/scss/primary_variables.scss | 2 +- theme_paptic/static/src/scss/primary_variables.scss | 2 +- theme_real_estate/static/src/scss/primary_variables.scss | 2 +- theme_treehouse/static/src/scss/primary_variables.scss | 2 +- theme_vehicle/static/src/scss/primary_variables.scss | 2 +- theme_yes/static/src/scss/primary_variables.scss | 2 +- theme_zap/static/src/scss/primary_variables.scss | 2 +- 26 files changed, 34 insertions(+), 24 deletions(-) diff --git a/theme_anelusia/static/src/scss/primary_variables.scss b/theme_anelusia/static/src/scss/primary_variables.scss index abe7074db..973134c3b 100644 --- a/theme_anelusia/static/src/scss/primary_variables.scss +++ b/theme_anelusia/static/src/scss/primary_variables.scss @@ -135,7 +135,7 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes, ) ); -$o-palette-priority-prefix: 'anelusia'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'generic-17'); $o-color-palettes-compatibility-indexes: ( 1: 'anelusia-1', diff --git a/theme_artists/static/src/scss/primary_variables.scss b/theme_artists/static/src/scss/primary_variables.scss index 2abe6e873..f1d98dc31 100644 --- a/theme_artists/static/src/scss/primary_variables.scss +++ b/theme_artists/static/src/scss/primary_variables.scss @@ -108,7 +108,7 @@ $o-website-values-palettes: ( ), ); -$o-palette-priority-prefix: 'artists'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'artists-1'); $o-color-palettes-compatibility-indexes: ( 1: 'artists-1', diff --git a/theme_avantgarde/static/src/scss/primary_variables.scss b/theme_avantgarde/static/src/scss/primary_variables.scss index 7ccacb426..0cd3e1446 100644 --- a/theme_avantgarde/static/src/scss/primary_variables.scss +++ b/theme_avantgarde/static/src/scss/primary_variables.scss @@ -196,7 +196,7 @@ $o-website-values-palettes: ( ), ); -$o-palette-priority-prefix: 'avantgarde'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'avantgarde-3'); $o-color-palettes-compatibility-indexes: ( 1: 'avantgarde-1', diff --git a/theme_aviato/static/src/scss/primary_variables.scss b/theme_aviato/static/src/scss/primary_variables.scss index 8675e1772..2a0fb854a 100644 --- a/theme_aviato/static/src/scss/primary_variables.scss +++ b/theme_aviato/static/src/scss/primary_variables.scss @@ -49,6 +49,12 @@ $o-website-values-palettes: ( ), ); +//------------------------------------------------------------------------------ +// Palettes +//------------------------------------------------------------------------------ + +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'treehouse-5'); + //------------------------------------------------------------------------------ // Fonts //------------------------------------------------------------------------------ diff --git a/theme_beauty/static/src/scss/primary_variables.scss b/theme_beauty/static/src/scss/primary_variables.scss index 5f2e799d2..a3cb81081 100644 --- a/theme_beauty/static/src/scss/primary_variables.scss +++ b/theme_beauty/static/src/scss/primary_variables.scss @@ -82,7 +82,7 @@ $o-website-values-palettes: ( ), ); -$o-palette-priority-prefix: 'beauty'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'beauty-1'); $o-color-palettes-compatibility-indexes: ( 1: 'beauty-1', diff --git a/theme_bewise/static/src/scss/primary_variables.scss b/theme_bewise/static/src/scss/primary_variables.scss index 431f8c608..4edd2c1c5 100644 --- a/theme_bewise/static/src/scss/primary_variables.scss +++ b/theme_bewise/static/src/scss/primary_variables.scss @@ -120,7 +120,7 @@ $o-website-values-palettes: ( ), ); -$o-palette-priority-prefix: 'bewise'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'bewise-1'); $o-color-palettes-compatibility-indexes: ( 1: 'bewise-1', diff --git a/theme_bistro/static/src/scss/primary_variables.scss b/theme_bistro/static/src/scss/primary_variables.scss index b5918df24..24a90b11f 100644 --- a/theme_bistro/static/src/scss/primary_variables.scss +++ b/theme_bistro/static/src/scss/primary_variables.scss @@ -171,7 +171,7 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes, ) ); -$o-palette-priority-prefix: 'bistro'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'bistro-5'); $o-color-palettes-compatibility-indexes: ( 1: 'bistro-1', diff --git a/theme_bookstore/static/src/scss/primary_variables.scss b/theme_bookstore/static/src/scss/primary_variables.scss index a21ad73ba..0cac0f5f6 100644 --- a/theme_bookstore/static/src/scss/primary_variables.scss +++ b/theme_bookstore/static/src/scss/primary_variables.scss @@ -78,7 +78,7 @@ $o-website-values-palettes: ( ), ); -$o-palette-priority-prefix: 'bookstore'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'generic-8'); $o-color-palettes-compatibility-indexes: ( 1: 'bookstore-1', diff --git a/theme_buzzy/static/src/scss/primary_variables.scss b/theme_buzzy/static/src/scss/primary_variables.scss index c2f40720f..32ae3ea0e 100644 --- a/theme_buzzy/static/src/scss/primary_variables.scss +++ b/theme_buzzy/static/src/scss/primary_variables.scss @@ -40,7 +40,11 @@ $o-website-values-palettes: ( ), ); +//------------------------------------------------------------------------------ +// Palettes +//------------------------------------------------------------------------------ +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'kiddo-2'); //------------------------------------------------------------------------------ // Fonts diff --git a/theme_clean/static/src/scss/primary_variables.scss b/theme_clean/static/src/scss/primary_variables.scss index fb651e285..3765960dc 100644 --- a/theme_clean/static/src/scss/primary_variables.scss +++ b/theme_clean/static/src/scss/primary_variables.scss @@ -205,7 +205,7 @@ $o-website-values-palettes: ( ), ); -$o-palette-priority-prefix: 'clean'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'clean-1'); $o-color-palettes-compatibility-indexes: ( 1: 'clean-1', diff --git a/theme_cobalt/static/src/scss/primary_variables.scss b/theme_cobalt/static/src/scss/primary_variables.scss index 8e4a2ccac..a42ef793d 100644 --- a/theme_cobalt/static/src/scss/primary_variables.scss +++ b/theme_cobalt/static/src/scss/primary_variables.scss @@ -44,7 +44,7 @@ $o-website-values-palettes: ( ), ); -$o-palette-priority-prefix: 'cobalt'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'cobalt-1'); $o-color-palettes-compatibility-indexes: ( 1: 'cobalt-1', diff --git a/theme_enark/static/src/scss/primary_variables.scss b/theme_enark/static/src/scss/primary_variables.scss index a9270424a..c0123add6 100644 --- a/theme_enark/static/src/scss/primary_variables.scss +++ b/theme_enark/static/src/scss/primary_variables.scss @@ -150,7 +150,7 @@ $o-website-values-palettes: ( ), ); -$o-palette-priority-prefix: 'enark'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'enark-1'); $o-color-palettes-compatibility-indexes: ( 1: 'enark-1', diff --git a/theme_graphene/static/src/scss/primary_variables.scss b/theme_graphene/static/src/scss/primary_variables.scss index 3869594fc..3e4d05a15 100644 --- a/theme_graphene/static/src/scss/primary_variables.scss +++ b/theme_graphene/static/src/scss/primary_variables.scss @@ -114,7 +114,7 @@ $o-website-values-palettes: ( ), ); -$o-palette-priority-prefix: 'graphene'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'graphene-1'); $o-color-palettes-compatibility-indexes: ( 1: 'graphene-1', diff --git a/theme_kea/static/src/scss/primary_variables.scss b/theme_kea/static/src/scss/primary_variables.scss index 18ff4c071..6f31010e4 100644 --- a/theme_kea/static/src/scss/primary_variables.scss +++ b/theme_kea/static/src/scss/primary_variables.scss @@ -127,7 +127,7 @@ $o-website-values-palettes: ( ), ); -$o-palette-priority-prefix: 'kea'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'bewise-2'); $o-color-palettes-compatibility-indexes: ( 1: 'kea-1', diff --git a/theme_kiddo/static/src/scss/primary_variables.scss b/theme_kiddo/static/src/scss/primary_variables.scss index 8b9f24649..c3078c46c 100644 --- a/theme_kiddo/static/src/scss/primary_variables.scss +++ b/theme_kiddo/static/src/scss/primary_variables.scss @@ -145,7 +145,7 @@ $o-website-values-palettes: ( ), ); -$o-palette-priority-prefix: 'kiddo'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'kiddo-3'); $o-color-palettes-compatibility-indexes: ( 1: 'kiddo-3', diff --git a/theme_loftspace/static/src/scss/primary_variables.scss b/theme_loftspace/static/src/scss/primary_variables.scss index 4f961397b..412310e50 100644 --- a/theme_loftspace/static/src/scss/primary_variables.scss +++ b/theme_loftspace/static/src/scss/primary_variables.scss @@ -143,7 +143,7 @@ $o-website-values-palettes: ( ), ); -$o-palette-priority-prefix: 'loftspace'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'graphene-2'); $o-color-palettes-compatibility-indexes: ( 1: 'loftspace-1', diff --git a/theme_monglia/static/src/scss/primary_variables.scss b/theme_monglia/static/src/scss/primary_variables.scss index 73e022d16..f03475e19 100644 --- a/theme_monglia/static/src/scss/primary_variables.scss +++ b/theme_monglia/static/src/scss/primary_variables.scss @@ -154,7 +154,7 @@ $o-website-values-palettes: ( ), ); -$o-palette-priority-prefix: 'monglia'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'monglia-1'); $o-color-palettes-compatibility-indexes: ( 1: 'monglia-1', diff --git a/theme_nano/static/src/scss/primary_variables.scss b/theme_nano/static/src/scss/primary_variables.scss index 4a9aa9429..02c6cd624 100644 --- a/theme_nano/static/src/scss/primary_variables.scss +++ b/theme_nano/static/src/scss/primary_variables.scss @@ -165,7 +165,7 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes, ) ); -$o-palette-priority-prefix: 'nano'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'nano-1'); $o-color-palettes-compatibility-indexes: ( 1: 'nano-1', diff --git a/theme_notes/static/src/scss/primary_variables.scss b/theme_notes/static/src/scss/primary_variables.scss index ae24d7db5..fad498d2a 100644 --- a/theme_notes/static/src/scss/primary_variables.scss +++ b/theme_notes/static/src/scss/primary_variables.scss @@ -133,7 +133,7 @@ $o-website-values-palettes: ( ), ); -$o-palette-priority-prefix: 'notes'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'notes-1'); $o-color-palettes-compatibility-indexes: ( 1: 'notes-1', diff --git a/theme_orchid/static/src/scss/primary_variables.scss b/theme_orchid/static/src/scss/primary_variables.scss index 84ff803ff..42c0a42cf 100644 --- a/theme_orchid/static/src/scss/primary_variables.scss +++ b/theme_orchid/static/src/scss/primary_variables.scss @@ -70,7 +70,7 @@ $o-website-values-palettes: ( ), ); -$o-palette-priority-prefix: 'orchid'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'orchid-7'); $o-color-palettes-compatibility-indexes: ( 1: 'orchid-1', diff --git a/theme_paptic/static/src/scss/primary_variables.scss b/theme_paptic/static/src/scss/primary_variables.scss index 493420a06..2943a018a 100644 --- a/theme_paptic/static/src/scss/primary_variables.scss +++ b/theme_paptic/static/src/scss/primary_variables.scss @@ -57,7 +57,7 @@ $o-website-values-palettes: ( ), ); -$o-palette-priority-prefix: 'paptic'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'paptic-1'); $o-color-palettes-compatibility-indexes: ( 1: 'paptic-1', diff --git a/theme_real_estate/static/src/scss/primary_variables.scss b/theme_real_estate/static/src/scss/primary_variables.scss index b222adb1a..f73287161 100644 --- a/theme_real_estate/static/src/scss/primary_variables.scss +++ b/theme_real_estate/static/src/scss/primary_variables.scss @@ -101,7 +101,7 @@ $o-website-values-palettes: ( ), ); -$o-palette-priority-prefix: 'real-estate'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'real-estate-4'); $o-color-palettes-compatibility-indexes: ( 1: 'real-estate-1', diff --git a/theme_treehouse/static/src/scss/primary_variables.scss b/theme_treehouse/static/src/scss/primary_variables.scss index 07df0dc95..d242279c8 100644 --- a/theme_treehouse/static/src/scss/primary_variables.scss +++ b/theme_treehouse/static/src/scss/primary_variables.scss @@ -166,7 +166,7 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes, ) ); -$o-palette-priority-prefix: 'treehouse'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'treehouse-1'); $o-color-palettes-compatibility-indexes: ( 1: 'treehouse-1', diff --git a/theme_vehicle/static/src/scss/primary_variables.scss b/theme_vehicle/static/src/scss/primary_variables.scss index 0de62958a..54f0c9f4a 100644 --- a/theme_vehicle/static/src/scss/primary_variables.scss +++ b/theme_vehicle/static/src/scss/primary_variables.scss @@ -130,7 +130,7 @@ $o-website-values-palettes: ( ), ); -$o-palette-priority-prefix: 'vehicle'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'vehicle-1'); $o-color-palettes-compatibility-indexes: ( 1: 'vehicle-1', diff --git a/theme_yes/static/src/scss/primary_variables.scss b/theme_yes/static/src/scss/primary_variables.scss index e5b6ccb75..b7e5d034e 100644 --- a/theme_yes/static/src/scss/primary_variables.scss +++ b/theme_yes/static/src/scss/primary_variables.scss @@ -68,7 +68,7 @@ $o-website-values-palettes: ( ), ); -$o-palette-priority-prefix: 'yes'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'yes-3'); $o-color-palettes-compatibility-indexes: ( 1: 'yes-1', diff --git a/theme_zap/static/src/scss/primary_variables.scss b/theme_zap/static/src/scss/primary_variables.scss index c42a35c16..d5a5b2e91 100644 --- a/theme_zap/static/src/scss/primary_variables.scss +++ b/theme_zap/static/src/scss/primary_variables.scss @@ -175,7 +175,7 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes, ) ); -$o-palette-priority-prefix: 'zap'; +$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'zap-1'); $o-color-palettes-compatibility-indexes: ( 1: 'zap-1',