From a07e51ab73807ec6f88d53f20ea932479da73614 Mon Sep 17 00:00:00 2001 From: "Antoine (anso)" Date: Tue, 30 Jul 2024 17:17:39 +0200 Subject: [PATCH] [IMP] theme_*: adapt themes with new global roundness option *: (anelusia, aviato, bistro, treehouse, zap) This commit adapts the themes to the use of a global roundness option, based on the new Odoo 18 website. task-3641683 --- theme_anelusia/static/src/scss/bootstrap_overridden.scss | 4 ---- theme_anelusia/static/src/scss/primary_variables.scss | 6 ++++++ theme_aviato/static/src/scss/bootstrap_overridden.scss | 4 +--- theme_bistro/static/src/scss/bootstrap_overridden.scss | 4 +--- theme_treehouse/static/src/scss/bootstrap_overridden.scss | 8 -------- theme_zap/static/src/scss/bootstrap_overridden.scss | 4 +--- theme_zap/static/src/scss/primary_variables.scss | 1 + 7 files changed, 10 insertions(+), 21 deletions(-) diff --git a/theme_anelusia/static/src/scss/bootstrap_overridden.scss b/theme_anelusia/static/src/scss/bootstrap_overridden.scss index 15ab6da2a4..4e00ea6d66 100644 --- a/theme_anelusia/static/src/scss/bootstrap_overridden.scss +++ b/theme_anelusia/static/src/scss/bootstrap_overridden.scss @@ -14,10 +14,6 @@ $spacer: 1.25rem !default; // // Define common padding and border radius sizes and more. -$border-radius: 0 !default; -$border-radius-lg: 0 !default; -$border-radius-sm: 0 !default; - $box-shadow-sm: 0 0 .3125rem rgba(0,0,0,.25) !default; $box-shadow: 0 0 .3125rem rgba(0,0,0,.25) !default; $box-shadow-lg: 0 0 .3125rem rgba(0,0,0,.25) !default; diff --git a/theme_anelusia/static/src/scss/primary_variables.scss b/theme_anelusia/static/src/scss/primary_variables.scss index 76e52416b2..f9236f67a3 100644 --- a/theme_anelusia/static/src/scss/primary_variables.scss +++ b/theme_anelusia/static/src/scss/primary_variables.scss @@ -13,6 +13,12 @@ $o-website-values-palettes: ( 'font': 'Source Sans Pro', 'headings-font': 'Spartan', + // Roundness + 'roundness': 'rounded-0', + 'border-radius-sm': null, + 'border-radius': null, + 'border-radius-lg': null, + // Links 'link-underline': 'never', diff --git a/theme_aviato/static/src/scss/bootstrap_overridden.scss b/theme_aviato/static/src/scss/bootstrap_overridden.scss index d4ec400cc3..266ea14ed4 100644 --- a/theme_aviato/static/src/scss/bootstrap_overridden.scss +++ b/theme_aviato/static/src/scss/bootstrap_overridden.scss @@ -20,9 +20,7 @@ $spacer: 1.25rem !default; // // Define common padding and border radius sizes and more. -$border-radius: .375rem !default; -$border-radius-lg: .5rem !default; -$border-radius-sm: .25rem !default; +$border-radius-lg: o-website-value('border-radius-lg') or map-get(map-get($o-theme-border-radius, o-website-value('roundness')), border-radius-lg) !default; // Buttons + Forms // diff --git a/theme_bistro/static/src/scss/bootstrap_overridden.scss b/theme_bistro/static/src/scss/bootstrap_overridden.scss index 06305361d2..f850e6e9d4 100644 --- a/theme_bistro/static/src/scss/bootstrap_overridden.scss +++ b/theme_bistro/static/src/scss/bootstrap_overridden.scss @@ -39,9 +39,7 @@ $spacer: 1.25rem !default; // // Define common padding and border radius sizes and more. -$border-radius: .375rem !default; -$border-radius-lg: .5rem !default; -$border-radius-sm: .25rem !default; +$border-radius-lg: o-website-value('border-radius-lg') or map-get(map-get($o-theme-border-radius, o-website-value('roundness')), border-radius-lg) !default; // Typography // diff --git a/theme_treehouse/static/src/scss/bootstrap_overridden.scss b/theme_treehouse/static/src/scss/bootstrap_overridden.scss index 3656dde7a9..fd439a48ce 100644 --- a/theme_treehouse/static/src/scss/bootstrap_overridden.scss +++ b/theme_treehouse/static/src/scss/bootstrap_overridden.scss @@ -36,14 +36,6 @@ $enable-shadows: true; $spacer: 1.25rem !default; -// Components -// -// Define common padding and border radius sizes and more. - -$border-radius: .375rem !default; -$border-radius-lg: .5rem !default; -$border-radius-sm: .25rem !default; - // Typography // // Font, line-height, and color for body text, headings, and more. diff --git a/theme_zap/static/src/scss/bootstrap_overridden.scss b/theme_zap/static/src/scss/bootstrap_overridden.scss index a35e7cbc00..88d0a7337c 100644 --- a/theme_zap/static/src/scss/bootstrap_overridden.scss +++ b/theme_zap/static/src/scss/bootstrap_overridden.scss @@ -75,9 +75,7 @@ $spacer: 1.25rem !default; // // Define common padding and border radius sizes and more. -$border-radius: .125rem !default; -$border-radius-lg: .25rem !default; -$border-radius-sm: 0 !default; +$border-radius-lg: o-website-value('border-radius-lg') or map-get(map-get($o-theme-border-radius, o-website-value('roundness')), border-radius-lg) !default; // Typography // diff --git a/theme_zap/static/src/scss/primary_variables.scss b/theme_zap/static/src/scss/primary_variables.scss index 52de288b46..768b764a96 100644 --- a/theme_zap/static/src/scss/primary_variables.scss +++ b/theme_zap/static/src/scss/primary_variables.scss @@ -5,6 +5,7 @@ $o-website-values-palettes: ( ( 'color-palettes-name': 'zap-1', + 'roundness': 'rounded-1', // Header 'header-template': 'hamburger',