From fccef8d19180904906539186bccbed7fc074d04f Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Wed, 23 Jan 2019 16:25:19 +0000
Subject: [PATCH] [FIX] web,website: use correct variable to define h* size +
 force fa font

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
---
 addons/web/static/src/scss/bootstrap_overridden.scss | 10 +++++-----
 addons/website/static/src/scss/website.scss          |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/scss/bootstrap_overridden.scss b/addons/web/static/src/scss/bootstrap_overridden.scss
index e8406c948e9..13d1a306ec4 100644
--- a/addons/web/static/src/scss/bootstrap_overridden.scss
+++ b/addons/web/static/src/scss/bootstrap_overridden.scss
@@ -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;
 
diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss
index e1c7bff9750..d55266cb77f 100644
--- a/addons/website/static/src/scss/website.scss
+++ b/addons/website/static/src/scss/website.scss
@@ -104,6 +104,7 @@ font[class*='bg-'] {
 
 // Icons
 .fa {
+    font-family: "FontAwesome" !important;
     $size: 3rem;
 
     &.rounded-circle,