pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web,website: use correct variable to define h* size + force fa font

Browse Source 
if you have some style e.g. on btn, and use class="fa fa-bug btn btn-sm" the
icon will be rendered with font-family style of btn
This commit is contained in:
Jeremy Kersten
2019-01-23 16:27:24 +00:00
parent a172e4ab77
commit fccef8d191
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/scss/bootstrap_overridden.scss
Vendored
+5 -5
View File
@@ -66,11 +66,11 @@ $font-family-sans-serif: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
$font-size-base: $o-font-size-base;
$line-height-base: $o-line-height-base;
$h1-font-size: $o-font-size-base * 2.0;
$h2-font-size: $o-font-size-base * 1.5;
$h3-font-size: $o-font-size-base * 1.3;
$h4-font-size: $o-font-size-base * 1.2;
$h5-font-size: $o-font-size-base * 1.1;
$h1-font-size: $font-size-base * 2.0;
$h2-font-size: $font-size-base * 1.5;
$h3-font-size: $font-size-base * 1.3;
$h4-font-size: $font-size-base * 1.2;
$h5-font-size: $font-size-base * 1.1;
$headings-font-weight: bold;
addons/website/static/src/scss/website.scss
+1
View File
@@ -104,6 +104,7 @@ font[class*='bg-'] {
// Icons
.fa {
font-family: "FontAwesome" !important;
$size: 3rem;
&.rounded-circle,