Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always bundle the theme CSS/JS #614

Merged
merged 4 commits into from
May 31, 2018
Merged

Always bundle the theme CSS/JS #614

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41d251a
Always bundle the theme CSS/JS
davidfischer Apr 18, 2018
41d08ee
Update changelog
davidfischer Apr 23, 2018
92f0065
Merge branch 'master' into always-bundle-js-css
davidfischer Apr 23, 2018
4b45725
Merge branch 'master' into always-bundle-js-css
davidfischer May 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,16 @@ Fixes
-----

* Fix table centering (#599)
* Do not rely on readthedocs.org for CSS/JS (#614)

Other Changes
--------------

v0.3.0
======

**Note**: this version resulted in some JavaScript incompatibilities when used on readthedocs.org

New Features
-------------

Expand Down
10 changes: 2 additions & 8 deletions sphinx_rtd_theme/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@

{% endif %}

{# RTD hosts this file, so just load on non RTD builds #}
{%- if not READTHEDOCS %}
<link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
{%- endif %}
<link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
<link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
{%- for css in css_files %}
{%- if css|attr("rel") %}
Expand Down Expand Up @@ -208,10 +205,7 @@

{% endif %}

{# RTD hosts this file, so just load on non RTD builds #}
{% if not READTHEDOCS %}
<script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>
{% endif %}
<script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>

<script type="text/javascript">
jQuery(function () {
Expand Down