From 5ba05f2ba4a8a454df5ff1c2e80a197d45fa6a9f Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Wed, 4 Apr 2018 12:56:08 +0200 Subject: [PATCH] [FIX] web, website: fix font path for bootstrap Before this commit, if you or a lib uses Glyphicons, the font was loaded from /web/content/fonts/ (or /web/static/src/less/fonts/ in debug=assets) It is because bootstrap is imported from /web/static/src/less/import_boostrap.less not directly from /web/static/lib/bootstrap/less/bootstrap.less Now, we use absolute path to load font, overriding the variable define in variables.less from bootstrap. --- addons/web/static/src/less/bootstrap_overridden.less | 2 ++ addons/website/static/src/less/website.ui.less | 2 ++ 2 files changed, 4 insertions(+) diff --git a/addons/web/static/src/less/bootstrap_overridden.less b/addons/web/static/src/less/bootstrap_overridden.less index 39df64ac86e..c63832db84d 100644 --- a/addons/web/static/src/less/bootstrap_overridden.less +++ b/addons/web/static/src/less/bootstrap_overridden.less @@ -101,3 +101,5 @@ overflow-x: initial; } } + +@icon-font-path: "/web/static/lib/bootstrap/fonts/"; diff --git a/addons/website/static/src/less/website.ui.less b/addons/website/static/src/less/website.ui.less index b92e86a3274..2d59324039a 100644 --- a/addons/website/static/src/less/website.ui.less +++ b/addons/website/static/src/less/website.ui.less @@ -51,3 +51,5 @@ body.o_connected_user { } } } + +@icon-font-path: "/web/static/lib/bootstrap/fonts/";