From fd7afa25f09f3214ebcc0c5e474bc1cd87bd4102 Mon Sep 17 00:00:00 2001 From: Benoit Socias Date: Mon, 25 Sep 2023 15:15:16 +0000 Subject: [PATCH] [FIX] website: restore button font-family in theme options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since [1] when the layout of the theme options was reorganized, the button's font-family option was not displayed anymore. This commit restores the button's font-family inside the "Button" section, before the button "Padding" options. [1]: https://github.com/odoo/odoo/commit/388e4bb2bfcaebdd4ff30277fb49a034592d7086 task-3478355 closes odoo/odoo#140692 X-original-commit: 718ae15606fe452da26fe9c4fa9c90cc443fd8f1 Signed-off-by: Soukéina Bojabza (sobo) Signed-off-by: Benoit Socias (bso) --- addons/website/static/src/scss/website.scss | 1 + addons/website/views/snippets/snippets.xml | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss index dc623dd464e..0260d4120e9 100644 --- a/addons/website/static/src/scss/website.scss +++ b/addons/website/static/src/scss/website.scss @@ -136,6 +136,7 @@ $-seen-urls: (); @include print-variable('display-3-margin-bottom', $display-3-margin-bottom); @include print-variable('display-4-margin-bottom', $display-4-margin-bottom); + @include print-variable('set-buttons-font', o-get-font-info('buttons')); @include print-variable('btn-padding-y', $btn-padding-y); @include print-variable('btn-padding-x', $btn-padding-x); @include print-variable('btn-font-size', $btn-font-size); diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml index 3c78bd8b26a..bd6bac6ddaf 100644 --- a/addons/website/views/snippets/snippets.xml +++ b/addons/website/views/snippets/snippets.xml @@ -1882,6 +1882,12 @@ + + + +