Merge pull request readthedocs#614 from rtfd/always-bundle-js-css

Always bundle the theme CSS/JS
mgeier · May 31, 2018 · 53e2a78 · 53e2a78
2 parents 0051b91 + 4b45725
commit 53e2a78
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -11,6 +11,8 @@ New Features
 
 Fixes
 -----
+
+* Do not rely on readthedocs.org for CSS/JS (#614)
 * Color accessibility improvements on the left navigation
 
 Other Changes
@@ -35,6 +37,8 @@ Fixes
 v0.3.0
 ======
 
+**Note**: this version resulted in some JavaScript incompatibilities when used on readthedocs.org
+
 New Features
 -------------
 

diff --git a/sphinx_rtd_theme/layout.html b/sphinx_rtd_theme/layout.html
@@ -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") %}
@@ -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 () {