diff --git a/extensions/odoo_theme/static/scss/_variables.scss b/extensions/odoo_theme/static/scss/_variables.scss index 907a05995..6d4c7c87a 100644 --- a/extensions/odoo_theme/static/scss/_variables.scss +++ b/extensions/odoo_theme/static/scss/_variables.scss @@ -6,7 +6,7 @@ $container-max-width-xxxl: 1560px; // Typography // =============================================== -$font-family-serif: 'Roboto Slab', Georgia, "Times New Roman", Times, serif; +$font-family-serif: 'Roboto Slab', Georgia, "Times New Roman", Times, serif; $fw_extralight: 200; $fw_light: 300; @@ -17,8 +17,6 @@ $fw_bold: 700; $fw_extrabold: 800; $fw_black: 900; -$font-size-secondary: .875rem; - //------------------------------------------------------------------------------ // icomoon icons //------------------------------------------------------------------------------ diff --git a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss index 0535180cd..ca6e9a978 100644 --- a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss +++ b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss @@ -35,18 +35,18 @@ $theme-colors: ( // Fonts // Font, line-height, and color for body text, headings, and more. -$font-family-base: "Inter", "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif !default; +$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-secondary; +$h6-font-size: $font-size-sm; // Buttons // For each of Bootstrap's buttons, define text, background, and border color. -$btn-font-size: $font-size-secondary; +$btn-font-size: $font-size-sm; $btn-font-weight: $fw_semibold; $btn-focus-box-shadow: 0 0 0 transparent; $btn-close-bg: url('data:image/svg+xml,'); diff --git a/extensions/odoo_theme/static/style.scss b/extensions/odoo_theme/static/style.scss index 2fd85d2b4..8f3bfe81d 100644 --- a/extensions/odoo_theme/static/style.scss +++ b/extensions/odoo_theme/static/style.scss @@ -145,7 +145,7 @@ header { .form-control { @include media-breakpoint-down(lg) { padding: 0.275rem 0.5rem; - font-size: $font-size-secondary; + font-size: $font-size-sm; } } @@ -216,7 +216,7 @@ header { padding-left: $padding-s; background-color: lighten($o-violet, 70%) ; z-index: 10; - @include font-size($font-size-secondary); + @include font-size($font-size-sm); color: $o-violet; font-weight: $fw_regular; @include media-breakpoint-up(lg) { @@ -374,7 +374,7 @@ header { aside.o_page_toc { color: $body-color; - @include font-size($font-size-secondary); + @include font-size($font-size-sm); &:not(.o_in_nav_toc) { display: none; @include media-breakpoint-up(xl) { @@ -652,7 +652,7 @@ header { position: relative; .o_git_link { - @include font-size($font-size-secondary); + @include font-size($font-size-sm); @include o-position-absolute($top: 0px, $right: $margin-s); @include media-breakpoint-up(lg) { @include o-position-absolute($top: 10px, $right: $margin-s); @@ -670,7 +670,7 @@ header { padding-top: $padding-xs; } &.class em.property { - font-size: $font-size-secondary; + font-size: $font-size-sm; &:first-child { border-bottom: 3px solid $o-literals-border; + [class^=sig] { @@ -687,7 +687,7 @@ header { } dl.field-list { - @include font-size($font-size-secondary); + @include font-size($font-size-sm); padding: .5rem; border: 1px solid $o-gray-border; @include media-breakpoint-down(lg) { @@ -856,7 +856,7 @@ header { } .dfn{ - @include font-size($font-size-secondary); + @include font-size($font-size-sm); line-height: 1; color: $blue-600; font-weight: $fw_semibold; @@ -881,7 +881,7 @@ header { border-radius: 4px 4px 0 0; background: $o-gray-bg; padding: .2rem 1rem; - @include font-size($font-size-secondary); + @include font-size($font-size-sm); font-weight: 600; } @@ -908,7 +908,7 @@ header { //------------------------------------------------------------------------------ .alert { border-width: 0 0 0 $alert-border-width; - @include font-size($font-size-secondary); + @include font-size($font-size-sm); code, div[class^="highlight"] { background-color: $white !important;