Skip to content
Snippets Groups Projects
Verified Commit ec73e154 authored by Lloyd Meins's avatar Lloyd Meins :thought_balloon: Committed by Jonathan Weth
Browse files

Serve Roboto font files from server

parent b528d806
No related branches found
No related tags found
1 merge request!476Resolve "Unify fonts across AlekSIS"
Pipeline #6045 canceled
...@@ -354,6 +354,7 @@ MEDIA_ROOT = _settings.get("media.root", os.path.join(BASE_DIR, "media")) ...@@ -354,6 +354,7 @@ MEDIA_ROOT = _settings.get("media.root", os.path.join(BASE_DIR, "media"))
NODE_MODULES_ROOT = _settings.get("node_modules.root", os.path.join(BASE_DIR, "node_modules")) NODE_MODULES_ROOT = _settings.get("node_modules.root", os.path.join(BASE_DIR, "node_modules"))
YARN_INSTALLED_APPS = [ YARN_INSTALLED_APPS = [
"@fontsource/roboto",
"datatables", "datatables",
"jquery", "jquery",
"materialize-css", "materialize-css",
...@@ -388,6 +389,7 @@ ANY_JS = { ...@@ -388,6 +389,7 @@ ANY_JS = {
}, },
"sortablejs": {"js_url": JS_URL + "/sortablejs/Sortable.min.js"}, "sortablejs": {"js_url": JS_URL + "/sortablejs/Sortable.min.js"},
"jquery-sortablejs": {"js_url": JS_URL + "/jquery-sortablejs/jquery-sortable.js"}, "jquery-sortablejs": {"js_url": JS_URL + "/jquery-sortablejs/jquery-sortable.js"},
"Roboto": {"css_url": JS_URL + "/@fontsource/roboto/index.css"},
} }
merge_app_settings("ANY_JS", ANY_JS, True) merge_app_settings("ANY_JS", ANY_JS, True)
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
{# CSS #} {# CSS #}
{% include_css "material-design-icons" %} {% include_css "material-design-icons" %}
{% include_css "Roboto" %}
<link rel="stylesheet" href="{% sass_src 'style.scss' %}"> <link rel="stylesheet" href="{% sass_src 'style.scss' %}">
{# Add JS URL resolver #} {# Add JS URL resolver #}
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
</title> </title>
{% include_css "material-design-icons" %} {% include_css "material-design-icons" %}
{% include_css "Roboto" %}
{% include_css "paper-css" %} {% include_css "paper-css" %}
<link rel="stylesheet" href="{% sass_src 'style.scss' %}"/> <link rel="stylesheet" href="{% sass_src 'style.scss' %}"/>
<link rel="stylesheet" href="{% static "print.css" %}"/> <link rel="stylesheet" href="{% static "print.css" %}"/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment