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

Merge branch 'wip-redesign'

Browse Source 
# Conflicts:
#	src/templates/homepage.pug
#	src/templates/services.pug
This commit is contained in:
Pablo Vazquez
2018-09-06 14:13:22 +02:00
parent 3fdbb92b93 b12b320cf0
commit 8dd1de1018
38 changed files with 2836 additions and 1404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/templates/projects/landing.pug
View File

@@ -78,8 +78,6 @@ script(src="{{ url_for('static_pillar', filename='assets/js/vendor/videojs-hotke
| {% endblock %}
| {% block css %}
link(href="{{ url_for('static_pillar', filename='assets/css/font-pillar.css') }}", rel="stylesheet")
link(href="{{ url_for('static_pillar', filename='assets/css/base.css') }}", rel="stylesheet")
link(href="{{ url_for('static_cloud', filename='assets/css/project-landing.css') }}", rel="stylesheet")
| {% endblock %}