archive/blender-cloud
0
1
Fork 1
Code Issues 24 Pull Requests Projects Releases Wiki Activity

CSS: Include font-pillar as part of main.css

Browse Source
This commit is contained in:
Pablo Vazquez
2019-04-03 13:01:08 +02:00
parent 79b409c83a
commit e03cf2f5da
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/styles/main.sass
View File

@@ -7,6 +7,9 @@
@import "../../../pillar/src/styles/config"
@import "../../../pillar/src/styles/utils"
$pillar-font-path: "../../../../static/pillar/assets/font"
@import "../../../pillar/src/styles/font-pillar"
// Bootstrap components.
@import "../../../pillar/node_modules/bootstrap/scss/root"
@import "../../../pillar/node_modules/bootstrap/scss/reboot"

3
src/styles/project-main.sass
View File

@@ -7,6 +7,9 @@
@import "../../../pillar/src/styles/_config"
@import "../../../pillar/src/styles/_utils"
$pillar-font-path: "../../../../static/pillar/assets/font"
@import "../../../pillar/src/styles/font-pillar"
// Bootstrap components.
@import "../../../pillar/node_modules/bootstrap/scss/root"
@import "../../../pillar/node_modules/bootstrap/scss/reboot"

1
src/templates/layout.pug
View File

@@ -47,7 +47,6 @@ html(lang="en")
| {% block head %}{% endblock %}
| {% block css %}
link(href="{{ url_for('static_pillar', filename='assets/css/font-pillar.css') }}", rel="stylesheet")
| {% if title == 'blog' %}
link(href="{{ url_for('static_pillar', filename='assets/css/blog.css') }}", rel="stylesheet")
| {% else %}