From e94a132e1aae75bc0b4954dbad52feadd39ea8fa Mon Sep 17 00:00:00 2001
From: Elisabeth Dickinson <edi@odoo.com>
Date: Fri, 16 Dec 2022 10:15:02 +0100
Subject: [PATCH] [IMP][CSS] Rescale heading fonts

---
 .../odoo_theme/layout_templates/footer.html   |  2 +-
 .../odoo_theme/layout_templates/page_toc.html |  2 +-
 .../static/scss/bootstrap_overridden.scss     | 19 +++++++++++--------
 extensions/odoo_theme/static/style.scss       |  7 +++----
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/extensions/odoo_theme/layout_templates/footer.html b/extensions/odoo_theme/layout_templates/footer.html
index 27de05dc6..d60af502e 100644
--- a/extensions/odoo_theme/layout_templates/footer.html
+++ b/extensions/odoo_theme/layout_templates/footer.html
@@ -1,6 +1,6 @@
 <div class="o_get_help container-fluid d-lg-flex">
     <div class="col-12 col-lg-10">
-        <h5><i class="i-o-help me-2"></i>{{ _("Get Help") }}</h5>
+        <h4><i class="i-o-help me-2"></i>{{ _("Get Help") }}</h4>
         <div>
             <a href="https://odoo.com/help" target="_blank" class="btn btn-outline-secondary mb-2">{{ _("Contact Support") }}</a>
             <a href="https://www.odoo.com/forum/help-1" target="_blank" class="btn btn-outline-secondary mb-2">{{ _("Ask the Odoo Community") }}</a>
diff --git a/extensions/odoo_theme/layout_templates/page_toc.html b/extensions/odoo_theme/layout_templates/page_toc.html
index c73d9f43e..cd5a288ad 100644
--- a/extensions/odoo_theme/layout_templates/page_toc.html
+++ b/extensions/odoo_theme/layout_templates/page_toc.html
@@ -1,4 +1,4 @@
 <div class="o_page_toc_nav mt-1">
-    <h3>{{ _("On this page") }}</h3>
+    <h5>{{ _("On this page") }}</h5>
     {{ toc }} {# this is the page TOC (or local toc) #}
 </div>
diff --git a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss
index ca6e9a978..19e7ae9ee 100644
--- a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss
+++ b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss
@@ -36,19 +36,22 @@ $theme-colors: (
 // Fonts
 // Font, line-height, and color for body text, headings, and more.
 $font-family-sans-serif:                    "Inter", "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif !default;
-$h1-font-size:                              1.875rem;
-$h2-font-size:                              1.5rem;
-$h3-font-size:                              1.125rem;
-$h4-font-size:                              1rem;
-$h5-font-size:                              1rem;
-$h6-font-size:                              $font-size-sm;
+
+// Change scale from Major Third to Major Second (ref: https://type-scale.com/)
+$font-size-base:                            1rem;
+$h1-font-size:                              $font-size-base * 1.802 !default;
+$h2-font-size:                              $font-size-base * 1.602 !default;
+$h3-font-size:                              $font-size-base * 1.424 !default;
+$h4-font-size:                              $font-size-base * 1.266 !default;
+$h5-font-size:                              $font-size-base * 1.125 !default;
+$h6-font-size:                              $font-size-base !default;
 
 // Buttons
 // For each of Bootstrap's buttons, define text, background, and border color.
 
-$btn-font-size:                             $font-size-sm;
+$btn-font-size:                             .875rem;
 $btn-font-weight:                           $fw_semibold;
-$btn-focus-box-shadow:                      0 0 0 transparent;
+$btn-close-focus-shadow:                    0 0 0 0 transparent;
 $btn-close-bg:                              url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30" fill="#000000"><path d="M15,16c-.27,0-.54-.11-.73-.31l-4.21-4.44c-.38-.4-.36-1.03,.04-1.41s1.03-.36,1.41,.04l3.48,3.67,3.42-3.67c.38-.4,1.01-.42,1.41-.05,.4,.38,.42,1.01,.05,1.41l-4.15,4.44c-.19,.2-.45,.32-.73,.32h0Z"/><path d="M10.79,20.44c-.25,0-.49-.09-.69-.27-.4-.38-.42-1.01-.04-1.41l4.21-4.45c.19-.2,.45-.31,.73-.31h0c.28,0,.54,.12,.73,.32l4.15,4.45c.38,.4,.35,1.04-.05,1.41-.41,.38-1.04,.35-1.41-.05l-3.42-3.67-3.48,3.67c-.2,.21-.46,.31-.73,.31Z"/><path d="M15,28.37c-7.37,0-13.37-6-13.37-13.37S7.63,1.63,15,1.63s13.37,6,13.37,13.37-6,13.37-13.37,13.37Zm0-24.74C8.73,3.63,3.63,8.73,3.63,15s5.1,11.37,11.37,11.37,11.37-5.1,11.37-11.37S21.27,3.63,15,3.63Z"/></svg>');
 $btn-close-width:                           2rem;
 
diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss
index 26eda3498..7ab2df43f 100644
--- a/extensions/odoo_theme/static/style.scss
+++ b/extensions/odoo_theme/static/style.scss
@@ -396,7 +396,7 @@ header {
             }
         }
 
-        h3 {
+        h5 {
             text-transform: uppercase;
             font-weight: $fw_bold;
             color: $o-gray-color;
@@ -438,7 +438,7 @@ header {
         }
     }
 
-    // Markup Styles (ex: ORM page)
+    // Literals Styles (ex: https://www.odoo.com/documentation/master/developer/reference/backend/orm.html#fields)
     .o_code, .sig [class^="sig-"] {
         display: inline-block;
         color: inherit;
@@ -1191,9 +1191,8 @@ footer {
             padding-left: calc(#{$o-side-nav-width} + #{$padding-l})
         }
 
-        h5 {
+        h4 {
             color: $secondary;
-            font-size: 20px;
             font-weight: $fw_bold;
             margin-bottom: 1.5rem;
         }