Skip to content
Snippets Groups Projects
Verified Commit 5fa1104e authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixes remaining issues with local fonts

parent 87816adf
No related branches found
No related tags found
No related merge requests found
...@@ -115,8 +115,6 @@ ...@@ -115,8 +115,6 @@
<!-- Webfonts --> <!-- Webfonts -->
{% block fonts %} {% block fonts %}
<link rel="stylesheet" type="text/css" href="{{ base_url }}/assets/fonts/roboto.css" />
<link rel="stylesheet" type="text/css" href="{{ base_url }}/assets/fonts/roboto-mono.css" />
<style> <style>
body, input { body, input {
font-family: Roboto, "Helvetica Neue", font-family: Roboto, "Helvetica Neue",
...@@ -127,8 +125,7 @@ ...@@ -127,8 +125,7 @@
Courier, monospace; Courier, monospace;
} }
</style> </style>
<link rel="stylesheet" type="text/css" href="{{ base_url }}/assets/fonts/MaterialIcons.css" /> <link rel="stylesheet" type="text/css" href="{{ base_url }}/assets/stylesheets/fonts.css" />
<link rel="stylesheet" type="text/css" href="{{ base_url }}/assets/fonts/fa-brands.css" />
{% endblock %} {% endblock %}
<!-- Custom stylesheets --> <!-- Custom stylesheets -->
......
...@@ -80,6 +80,12 @@ module.exports = env => { ...@@ -80,6 +80,12 @@ module.exports = env => {
use: `file-loader?name=[path][name]${ use: `file-loader?name=[path][name]${
env && env.prod ? ".[md5:hash:hex:8]" : "" env && env.prod ? ".[md5:hash:hex:8]" : ""
}.[ext]&context=./src` }.[ext]&context=./src`
},
{
test: /\.(eot|svg|ttf|woff|woff2)$/,
use: `file-loader?name=[path][name]${
env && env.prod ? ".[md5:hash:hex:8]" : ""
}.[ext]&context=./src`
} }
] ]
}, },
...@@ -211,6 +217,7 @@ module.exports = env => { ...@@ -211,6 +217,7 @@ module.exports = env => {
/* Compile stylesheets */ /* Compile stylesheets */
for (const stylesheet of [ for (const stylesheet of [
"fonts.scss",
"application.scss", "application.scss",
"application-palette.scss" "application-palette.scss"
]) { ]) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment