From 6e16e99340a1b7f8b2ff4129e686b8041d257c85 Mon Sep 17 00:00:00 2001
From: Thomas Robitaille <thomas.robitaille@gmail.com>
Date: Tue, 23 Jul 2019 09:28:36 +0100
Subject: [PATCH] Fix deprecation warning in theme

---
 CHANGES.rst                                          |  2 +-
 .../sphinx/themes/bootstrap-astropy/layout.html      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index c0b7e080..0b918355 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,7 +5,7 @@ astropy-helpers Changelog
 2.0.11 (unreleased)
 -------------------
 
-- No changes yet.
+- Fixed deprecation warning in sphinx theme. [#493]
 
 
 2.0.10 (2019-05-29)
diff --git a/astropy_helpers/sphinx/themes/bootstrap-astropy/layout.html b/astropy_helpers/sphinx/themes/bootstrap-astropy/layout.html
index 8e82f05c..801e699a 100644
--- a/astropy_helpers/sphinx/themes/bootstrap-astropy/layout.html
+++ b/astropy_helpers/sphinx/themes/bootstrap-astropy/layout.html
@@ -1,16 +1,16 @@
 {% extends "basic/layout.html" %}
 
-{# Collapsible sidebar script from default/layout.html in Sphinx #}
-{% set script_files = script_files + ['_static/sidebar.js'] %}
+{%- block scripts %}
+    {{ super() }}
+    <script type="text/javascript" src="{{ pathto('_static/sidebar.js', 1) }}"></script>
+    {% if not embedded %}<script type="text/javascript" src="{{ pathto('_static/copybutton.js', 1) }}"></script>{% endif %}
+{%- endblock %}
 
 {# Add the google webfonts needed for the logo #}
 {% block extrahead %}
-<link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:200,600' rel='stylesheet' type='text/css'/>
-{% if not embedded %}<script type="text/javascript" src="{{ pathto('_static/copybutton.js', 1) }}"></script>{% endif %}
-
+    <link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:200,600' rel='stylesheet' type='text/css'/>
 {% endblock %}
 
-
 {% block header %}
 <div class="topbar">
   <a class="brand" title="{{ _('Documentation Home') }}" href="{{ pathto(master_doc) }}"><span id="logotext1">{{ theme_logotext1 }}</span><span id="logotext2">{{ theme_logotext2 }}</span><span id="logotext3">{{ theme_logotext3 }}</span></a>