From 7deceae18c209c67f6cfbbe3f7704798bb02a42e Mon Sep 17 00:00:00 2001 From: Andrea Ulliana Date: Wed, 26 Jun 2019 12:28:13 +0000 Subject: [IMP] website, *: use "auto" widget for font customization * theme_bootswatch, theme_default, website_theme_install This commit makes use of the new 'auto' widget for font selection: instead of enabling a template which will enable a scss file which sets a font variable to a specific value... we directly allow to do a scss custo which sets that value. The code in charge of resetting font customizations on theme switching is also moved and refactored here in website (instead of being specific to each theme). Part of https://github.com/odoo/odoo/pull/33442 task-1974659 Co-authored-by: qsm-odoo --- addons/website/static/src/scss/bootstrap_overridden.scss | 4 ++-- .../options/fonts/option_font_body_02_variables.scss | 1 - .../options/fonts/option_font_body_03_variables.scss | 1 - .../options/fonts/option_font_body_04_variables.scss | 1 - .../options/fonts/option_font_body_05_variables.scss | 1 - .../options/fonts/option_font_body_06_variables.scss | 1 - .../options/fonts/option_font_button_02_variables.scss | 1 - .../options/fonts/option_font_button_03_variables.scss | 1 - .../options/fonts/option_font_button_04_variables.scss | 1 - .../options/fonts/option_font_button_05_variables.scss | 1 - .../options/fonts/option_font_button_06_variables.scss | 1 - .../options/fonts/option_font_navbar_02_variables.scss | 1 - .../options/fonts/option_font_navbar_03_variables.scss | 1 - .../options/fonts/option_font_navbar_04_variables.scss | 1 - .../options/fonts/option_font_navbar_05_variables.scss | 1 - .../options/fonts/option_font_navbar_06_variables.scss | 1 - .../options/fonts/option_font_title_02_variables.scss | 1 - .../options/fonts/option_font_title_03_variables.scss | 1 - .../options/fonts/option_font_title_04_variables.scss | 1 - .../options/fonts/option_font_title_05_variables.scss | 1 - .../options/fonts/option_font_title_06_variables.scss | 1 - addons/website/static/src/scss/primary_variables.scss | 8 ++++---- addons/website/static/src/scss/secondary_variables.scss | 4 ++++ addons/website/static/src/scss/website.scss | 16 ++++++++-------- 24 files changed, 18 insertions(+), 34 deletions(-) delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_body_02_variables.scss delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_body_03_variables.scss delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_body_04_variables.scss delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_body_05_variables.scss delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_body_06_variables.scss delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_button_02_variables.scss delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_button_03_variables.scss delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_button_04_variables.scss delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_button_05_variables.scss delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_button_06_variables.scss delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_navbar_02_variables.scss delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_navbar_03_variables.scss delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_navbar_04_variables.scss delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_navbar_05_variables.scss delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_navbar_06_variables.scss delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_title_02_variables.scss delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_title_03_variables.scss delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_title_04_variables.scss delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_title_05_variables.scss delete mode 100644 addons/website/static/src/scss/options/fonts/option_font_title_06_variables.scss (limited to 'addons/website/static/src') diff --git a/addons/website/static/src/scss/bootstrap_overridden.scss b/addons/website/static/src/scss/bootstrap_overridden.scss index 1dd53f6a7bf..011e16511f5 100644 --- a/addons/website/static/src/scss/bootstrap_overridden.scss +++ b/addons/website/static/src/scss/bootstrap_overridden.scss @@ -25,9 +25,9 @@ $body-color: palette-color('text') !default; // // Font, line-height, and color for body text, headings, and more. -$font-family-sans-serif: nth($o-theme-fonts, $o-theme-font-number) !default; +$font-family-sans-serif: $o-theme-font !default; -$headings-font-family: nth($o-theme-fonts, $o-theme-headings-font-number) !default; +$headings-font-family: $o-theme-headings-font !default; $headings-color: palette-color('h1') !default; // Jumbotron diff --git a/addons/website/static/src/scss/options/fonts/option_font_body_02_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_body_02_variables.scss deleted file mode 100644 index ab959cd7a6d..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_body_02_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-font-number: 2; diff --git a/addons/website/static/src/scss/options/fonts/option_font_body_03_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_body_03_variables.scss deleted file mode 100644 index 882e72a0b72..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_body_03_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-font-number: 3; diff --git a/addons/website/static/src/scss/options/fonts/option_font_body_04_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_body_04_variables.scss deleted file mode 100644 index 5340d78012c..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_body_04_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-font-number: 4; diff --git a/addons/website/static/src/scss/options/fonts/option_font_body_05_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_body_05_variables.scss deleted file mode 100644 index 31723e664c0..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_body_05_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-font-number: 5; diff --git a/addons/website/static/src/scss/options/fonts/option_font_body_06_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_body_06_variables.scss deleted file mode 100644 index 66abf12c21c..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_body_06_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-font-number: 6; diff --git a/addons/website/static/src/scss/options/fonts/option_font_button_02_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_button_02_variables.scss deleted file mode 100644 index 2d804021980..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_button_02_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-buttons-font-number: 2; diff --git a/addons/website/static/src/scss/options/fonts/option_font_button_03_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_button_03_variables.scss deleted file mode 100644 index 1c614fd35d0..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_button_03_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-buttons-font-number: 3; diff --git a/addons/website/static/src/scss/options/fonts/option_font_button_04_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_button_04_variables.scss deleted file mode 100644 index 8ef0852a1ff..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_button_04_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-buttons-font-number: 4; diff --git a/addons/website/static/src/scss/options/fonts/option_font_button_05_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_button_05_variables.scss deleted file mode 100644 index 0adadb1e9c4..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_button_05_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-buttons-font-number: 5; diff --git a/addons/website/static/src/scss/options/fonts/option_font_button_06_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_button_06_variables.scss deleted file mode 100644 index fa00777d716..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_button_06_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-buttons-font-number: 6; diff --git a/addons/website/static/src/scss/options/fonts/option_font_navbar_02_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_navbar_02_variables.scss deleted file mode 100644 index 45d8014b8eb..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_navbar_02_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-navbar-font-number: 2; diff --git a/addons/website/static/src/scss/options/fonts/option_font_navbar_03_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_navbar_03_variables.scss deleted file mode 100644 index c46c2de1180..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_navbar_03_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-navbar-font-number: 3; diff --git a/addons/website/static/src/scss/options/fonts/option_font_navbar_04_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_navbar_04_variables.scss deleted file mode 100644 index 69662acc773..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_navbar_04_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-navbar-font-number: 4; diff --git a/addons/website/static/src/scss/options/fonts/option_font_navbar_05_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_navbar_05_variables.scss deleted file mode 100644 index c96837086b5..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_navbar_05_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-navbar-font-number: 5; diff --git a/addons/website/static/src/scss/options/fonts/option_font_navbar_06_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_navbar_06_variables.scss deleted file mode 100644 index 49ef9f8167c..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_navbar_06_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-navbar-font-number: 6; diff --git a/addons/website/static/src/scss/options/fonts/option_font_title_02_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_title_02_variables.scss deleted file mode 100644 index 690e1b1c3a6..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_title_02_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-headings-font-number: 2; diff --git a/addons/website/static/src/scss/options/fonts/option_font_title_03_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_title_03_variables.scss deleted file mode 100644 index c68022bb4da..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_title_03_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-headings-font-number: 3; diff --git a/addons/website/static/src/scss/options/fonts/option_font_title_04_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_title_04_variables.scss deleted file mode 100644 index 37b5a9b328f..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_title_04_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-headings-font-number: 4; diff --git a/addons/website/static/src/scss/options/fonts/option_font_title_05_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_title_05_variables.scss deleted file mode 100644 index ca1848f61ed..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_title_05_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-headings-font-number: 5; diff --git a/addons/website/static/src/scss/options/fonts/option_font_title_06_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_title_06_variables.scss deleted file mode 100644 index 572800b17ec..00000000000 --- a/addons/website/static/src/scss/options/fonts/option_font_title_06_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$o-theme-headings-font-number: 6; diff --git a/addons/website/static/src/scss/primary_variables.scss b/addons/website/static/src/scss/primary_variables.scss index bb9d182756a..605bf113396 100644 --- a/addons/website/static/src/scss/primary_variables.scss +++ b/addons/website/static/src/scss/primary_variables.scss @@ -51,6 +51,10 @@ $o-website-values-palettes: ( ( 'logo-height': null, // Default to navbar height (see portal) 'header-font-size': null, // Default to BS (normal font-size) + 'font-number': 1, + 'headings-font-number': 1, + 'navbar-font-number': 1, + 'buttons-font-number': 1, ), ) !default; $o-website-values-palette-number: 1 !default; @@ -87,7 +91,3 @@ $o-theme-font-names: ( 'Noto Serif', 'Arvo', ) !default; -$o-theme-font-number: 1 !default; -$o-theme-headings-font-number: 1 !default; -$o-theme-buttons-font-number: 1 !default; -$o-theme-navbar-font-number: 1 !default; diff --git a/addons/website/static/src/scss/secondary_variables.scss b/addons/website/static/src/scss/secondary_variables.scss index 168965c56f1..1169ee22fbc 100644 --- a/addons/website/static/src/scss/secondary_variables.scss +++ b/addons/website/static/src/scss/secondary_variables.scss @@ -51,3 +51,7 @@ $o-website-values-palette-number: length($o-website-values-palettes); } $o-theme-navbar-logo-height: o-website-value('logo-height') !default; +$o-theme-font: nth($o-theme-fonts, o-website-value('font-number')) !default; +$o-theme-headings-font: nth($o-theme-fonts, o-website-value('headings-font-number')) !default; +$o-theme-navbar-font: nth($o-theme-fonts, o-website-value('navbar-font-number')) !default; +$o-theme-buttons-font: nth($o-theme-fonts, o-website-value('buttons-font-number')) !default; diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss index 5fb20b332c8..c63c246acec 100644 --- a/addons/website/static/src/scss/website.scss +++ b/addons/website/static/src/scss/website.scss @@ -4,10 +4,10 @@ $-seen: (); $-font-numbers: ( - $o-theme-font-number, - $o-theme-headings-font-number, - $o-theme-buttons-font-number, - $o-theme-navbar-font-number + o-website-value('font-number'), + o-website-value('headings-font-number'), + o-website-value('navbar-font-number'), + o-website-value('buttons-font-number'), ); @each $-number in $-font-numbers { @if index($-seen, $-number) == null { @@ -75,8 +75,8 @@ $-font-numbers: ( } .navbar { - @if ($o-theme-navbar-font-number != $o-theme-font-number) { - font-family: nth($o-theme-fonts, $o-theme-navbar-font-number); + @if ($o-theme-navbar-font != $o-theme-font) { + font-family: $o-theme-navbar-font; } .nav-item { @@ -154,8 +154,8 @@ h6 { color: color('h6'); } .btn { - @if ($o-theme-buttons-font-number != $o-theme-font-number) { - font-family: nth($o-theme-fonts, $o-theme-buttons-font-number); + @if ($o-theme-buttons-font != $o-theme-font) { + font-family: $o-theme-buttons-font; } } -- cgit v1.2.3