From ab791fab67d881fd7a43776b5064212248562896 Mon Sep 17 00:00:00 2001 From: Benoit Socias Date: Tue, 14 Feb 2023 13:02:54 +0000 Subject: [PATCH] [IMP] theme_cobalt, theme_paptic: adapt to new theme options This commit adapt themes to rely on the new theme option `headings-line-height`. See https://github.com/odoo/odoo/pull/111621. task-3140991 closes odoo/design-themes#633 Related: odoo/odoo#111621 Signed-off-by: Quentin Smetz (qsm) --- theme_cobalt/static/src/scss/bootstrap_overridden.scss | 1 - theme_cobalt/static/src/scss/primary_variables.scss | 2 ++ theme_paptic/static/src/scss/bootstrap_overridden.scss | 1 - theme_paptic/static/src/scss/primary_variables.scss | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/theme_cobalt/static/src/scss/bootstrap_overridden.scss b/theme_cobalt/static/src/scss/bootstrap_overridden.scss index f905a4768..b9d1adc89 100644 --- a/theme_cobalt/static/src/scss/bootstrap_overridden.scss +++ b/theme_cobalt/static/src/scss/bootstrap_overridden.scss @@ -4,5 +4,4 @@ // Headings -$headings-line-height: 1.1 !default; $headings-font-weight: 600 !default; diff --git a/theme_cobalt/static/src/scss/primary_variables.scss b/theme_cobalt/static/src/scss/primary_variables.scss index e3b75dc71..6b1b9e330 100644 --- a/theme_cobalt/static/src/scss/primary_variables.scss +++ b/theme_cobalt/static/src/scss/primary_variables.scss @@ -32,6 +32,8 @@ $o-website-values-palettes: ( 'font': 'Inter', + 'headings-line-height': 1.1, + 'hamburger-type': 'off-canvas', 'menu-box-shadow': false, diff --git a/theme_paptic/static/src/scss/bootstrap_overridden.scss b/theme_paptic/static/src/scss/bootstrap_overridden.scss index 16767dc7a..a86f93d80 100644 --- a/theme_paptic/static/src/scss/bootstrap_overridden.scss +++ b/theme_paptic/static/src/scss/bootstrap_overridden.scss @@ -1,6 +1,5 @@ // Headings -$headings-line-height: 1.1 !default; $headings-font-weight: 600 !default; diff --git a/theme_paptic/static/src/scss/primary_variables.scss b/theme_paptic/static/src/scss/primary_variables.scss index 2943a018a..e81ab0f3a 100644 --- a/theme_paptic/static/src/scss/primary_variables.scss +++ b/theme_paptic/static/src/scss/primary_variables.scss @@ -42,6 +42,7 @@ $o-website-values-palettes: ( 'font-size-base': (14 / 16) * 1rem, 'header-font-size': (14 / 16) * 1rem, + 'headings-line-height': 1.1, 'hamburger-type': 'off-canvas', 'menu-box-shadow': false,