Merge branch 'master' into raf-scroll

This commit is contained in:
Eric Holscher 2017-12-03 09:30:50 -08:00 committed by GitHub
commit 1266936100
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions

View File

@ -42,7 +42,9 @@
{% if not READTHEDOCS %}
<link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
{% endif %}
<link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
{% for cssfile in css_files %}
<link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
{% endfor %}

View File

@ -1,6 +1,7 @@
[theme]
inherit = basic
stylesheet = css/theme.css
pygments_style = default
[options]
typekit_id = hiw1hhg