NextERP/documentation
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP][CSS] Cleanup font variables

Browse Source
This commit is contained in:
Elisabeth Dickinson 2022-12-15 16:40:16 +01:00 committed by Antoine Vandevenne (anv)
parent 5b6705fecc
commit f35e8482f8
3 changed files with 13 additions and 15 deletions

4
extensions/odoo_theme/static/scss/_variables.scss
View File

@ -6,7 +6,7 @@ $container-max-width-xxxl: 1560px;
// Typography // 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_extralight: 200;
$fw_light: 300; $fw_light: 300;
@ -17,8 +17,6 @@ $fw_bold: 700;
$fw_extrabold: 800; $fw_extrabold: 800;
$fw_black: 900; $fw_black: 900;
$font-size-secondary: .875rem;
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// icomoon icons // icomoon icons
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

6
extensions/odoo_theme/static/scss/bootstrap_overridden.scss vendored
View File

@ -35,18 +35,18 @@ $theme-colors: (
// Fonts // Fonts
// Font, line-height, and color for body text, headings, and more. // 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; $h1-font-size: 1.875rem;
$h2-font-size: 1.5rem; $h2-font-size: 1.5rem;
$h3-font-size: 1.125rem; $h3-font-size: 1.125rem;
$h4-font-size: 1rem; $h4-font-size: 1rem;
$h5-font-size: 1rem; $h5-font-size: 1rem;
$h6-font-size: $font-size-secondary; $h6-font-size: $font-size-sm;
// Buttons // Buttons
// For each of Bootstrap's buttons, define text, background, and border color. // 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-font-weight: $fw_semibold;
$btn-focus-box-shadow: 0 0 0 transparent; $btn-focus-box-shadow: 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-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>');

18
extensions/odoo_theme/static/style.scss
View File

@ -145,7 +145,7 @@ header {
.form-control { .form-control {
@include media-breakpoint-down(lg) { @include media-breakpoint-down(lg) {
padding: 0.275rem 0.5rem; padding: 0.275rem 0.5rem;
font-size: $font-size-secondary; font-size: $font-size-sm;
} }
} }
@ -216,7 +216,7 @@ header {
padding-left: $padding-s; padding-left: $padding-s;
background-color: lighten($o-violet, 70%) ; background-color: lighten($o-violet, 70%) ;
z-index: 10; z-index: 10;
@include font-size($font-size-secondary); @include font-size($font-size-sm);
color: $o-violet; color: $o-violet;
font-weight: $fw_regular; font-weight: $fw_regular;
@include media-breakpoint-up(lg) { @include media-breakpoint-up(lg) {
@ -374,7 +374,7 @@ header {
aside.o_page_toc { aside.o_page_toc {
color: $body-color; color: $body-color;
@include font-size($font-size-secondary); @include font-size($font-size-sm);
&:not(.o_in_nav_toc) { &:not(.o_in_nav_toc) {
display: none; display: none;
@include media-breakpoint-up(xl) { @include media-breakpoint-up(xl) {
@ -652,7 +652,7 @@ header {
position: relative; position: relative;
.o_git_link { .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 o-position-absolute($top: 0px, $right: $margin-s);
@include media-breakpoint-up(lg) { @include media-breakpoint-up(lg) {
@include o-position-absolute($top: 10px, $right: $margin-s); @include o-position-absolute($top: 10px, $right: $margin-s);
@ -670,7 +670,7 @@ header {
padding-top: $padding-xs; padding-top: $padding-xs;
} }
&.class em.property { &.class em.property {
font-size: $font-size-secondary; font-size: $font-size-sm;
&:first-child { &:first-child {
border-bottom: 3px solid $o-literals-border; border-bottom: 3px solid $o-literals-border;
+ [class^=sig] { + [class^=sig] {
@ -687,7 +687,7 @@ header {
} }
dl.field-list { dl.field-list {
@include font-size($font-size-secondary); @include font-size($font-size-sm);
padding: .5rem; padding: .5rem;
border: 1px solid $o-gray-border; border: 1px solid $o-gray-border;
@include media-breakpoint-down(lg) { @include media-breakpoint-down(lg) {
@ -856,7 +856,7 @@ header {
} }
.dfn{ .dfn{
@include font-size($font-size-secondary); @include font-size($font-size-sm);
line-height: 1; line-height: 1;
color: $blue-600; color: $blue-600;
font-weight: $fw_semibold; font-weight: $fw_semibold;
@ -881,7 +881,7 @@ header {
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
background: $o-gray-bg; background: $o-gray-bg;
padding: .2rem 1rem; padding: .2rem 1rem;
@include font-size($font-size-secondary); @include font-size($font-size-sm);
font-weight: 600; font-weight: 600;
} }
@ -908,7 +908,7 @@ header {
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
.alert { .alert {
border-width: 0 0 0 $alert-border-width; border-width: 0 0 0 $alert-border-width;
@include font-size($font-size-secondary); @include font-size($font-size-sm);
code, div[class^="highlight"] { code, div[class^="highlight"] {
background-color: $white !important; background-color: $white !important;