summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Kersten <jke@odoo.com>2018-04-04 12:56:08 +0200
committerJeremy Kersten <jke@odoo.com>2018-04-04 13:02:21 +0200
commit5ba05f2ba4a8a454df5ff1c2e80a197d45fa6a9f (patch)
tree7aec716ea392caf539fe00c0ccc5e7a6f502f6b4
parentbff47822f83b018922279662a363171f8c977b89 (diff)
[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.
-rw-r--r--addons/web/static/src/less/bootstrap_overridden.less2
-rw-r--r--addons/website/static/src/less/website.ui.less2
2 files changed, 4 insertions, 0 deletions
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/";