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

[DESIGN] update font-sizes : now base size is 16px and secondary font size is 14px

Browse Source
This commit is contained in:
Elisabeth Dickinson 2021-02-26 16:34:58 +01:00
parent 9026a86ee9
commit eeebf93eb3
4 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/odoo_theme/static/scss/_mixins.scss
View File

@ -112,7 +112,7 @@
@mixin inline-icomoon($icon-content, $margin) { @mixin inline-icomoon($icon-content, $margin) {
content: '#{$icon-content}'; content: '#{$icon-content}';
font-family: '#{$icomoon-font-family}' !important; font-family: '#{$icomoon-font-family}' !important;
font-size: 1.5rem; @include font-size(1.5rem);
font-weight: $fw_regular; font-weight: $fw_regular;
vertical-align: middle; vertical-align: middle;
margin: $margin; margin: $margin;

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

@ -241,6 +241,7 @@ $website-2x-prefix: "2x_";
// Animations and Transitions // Animations and Transitions
$o-ease: cubic-bezier(.55,0,.1,1); $o-ease: cubic-bezier(.55,0,.1,1);
$font-size-secondary: .875rem;
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// icomoon icons // icomoon icons
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

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

@ -20,23 +20,12 @@ $border-radius-sm: 1rem / 16 !default;
// //
// Font, line-height, and color for body text, headings, and more. // Font, line-height, and color for body text, headings, and more.
$font-size-base: 0.875rem; $h1-font-size: 1.875rem;
$line-height-base: 1.45 !default; $h2-font-size: 1.5rem;
$h3-font-size: 1.125rem;
$h4-font-size: 1rem;
$h1-font-size: $font-size-base * 2.5 !default; $h5-font-size: 1rem;
$h2-font-size: $font-size-base * 2 !default; $h6-font-size: $font-size-secondary;
$h3-font-size: $font-size-base * 1.75 !default;
$h4-font-size: $font-size-base * 1.5 !default;
$h5-font-size: $font-size-base * 1.25 !default;
$h6-font-size: $font-size-base !default;
/* $h1-font-size: $font-size-base * (39 / 15) !default;
$h2-font-size: $font-size-base * (32 / 15) !default;
$h3-font-size: $font-size-base * (26 / 15) !default;
$h4-font-size: $font-size-base * (19 / 15) !default;
$h5-font-size: $font-size-base * (15 / 15) !default;
$h6-font-size: $font-size-base * (13 / 15) !default; */
/* $headings-font-weight: $fw_semibold !default; */ /* $headings-font-weight: $fw_semibold !default; */

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

@ -11,7 +11,6 @@ div[aria-label="related navigation"] {
} }
body { body {
font-size: $font-size-base;
a { a {
text-decoration: none !important; text-decoration: none !important;
} }
@ -86,6 +85,7 @@ header.o_main_header{
padding-left: 3rem; padding-left: 3rem;
background-color: lighten($o-violet-dark, 70%) ; background-color: lighten($o-violet-dark, 70%) ;
z-index: 10; z-index: 10;
@include font-size($font-size-secondary);
> ul { > ul {
padding-left: 30px !important; padding-left: 30px !important;
@ -205,7 +205,7 @@ header.o_main_header{
&:before { &:before {
@include inline-icomoon($i-o-services , 0 1rem 0 0); @include inline-icomoon($i-o-services , 0 1rem 0 0);
display: block; display: block;
font-size: 50px; @include font-size(50px);
margin: 0 auto 20px; margin: 0 auto 20px;
} }
&.o_title_start:before { &.o_title_start:before {
@ -359,6 +359,7 @@ header.o_main_header{
.o_git_link { .o_git_link {
color: $gray; color: $gray;
@include o-position-absolute($top: 0, $right: 1rem); @include o-position-absolute($top: 0, $right: 1rem);
@include font-size($font-size-secondary);
i { i {
font-size: 1.2rem; font-size: 1.2rem;
margin-right: .2rem; margin-right: .2rem;
@ -391,6 +392,7 @@ header.o_main_header{
visibility: hidden !important; visibility: hidden !important;
&:after { &:after {
@include inline-icomoon($i-link, 0 1rem 0 0); @include inline-icomoon($i-link, 0 1rem 0 0);
@include font-size($font-size-base);
visibility: hidden; visibility: hidden;
font-size: 1rem; font-size: 1rem;
color: $gray-light; color: $gray-light;
@ -460,7 +462,6 @@ header.o_main_header{
} }
> h3, > .alert-title { > h3, > .alert-title {
font-size: 1.642857143em;
line-height: 1em; line-height: 1em;
margin: 0 0 10px 0; margin: 0 0 10px 0;
font-size: 1rem; font-size: 1rem;