From e3e61d928109004b0c6710713be81647fe723a71 Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Fri, 2 Oct 2020 16:08:18 -0400 Subject: [PATCH] Fix missing colons in dask/dask (#43) This fix updates the `layout.html` with changes I grabbed from readthedocs/sphinx_rtd_theme#838 that relate to the version of the `htmlwriter` that is used. This should resolve dask/dask#6696 once a new release of the theme is cut (I've bumped the version in `__init__.py`) and the update is pulled in there. * Switch back to `extends` from rtd theme --- dask_sphinx_theme/__init__.py | 2 +- dask_sphinx_theme/layout.html | 105 +--------------------------------- 2 files changed, 2 insertions(+), 105 deletions(-) diff --git a/dask_sphinx_theme/__init__.py b/dask_sphinx_theme/__init__.py index 87744d7..dfd00a9 100644 --- a/dask_sphinx_theme/__init__.py +++ b/dask_sphinx_theme/__init__.py @@ -1,6 +1,6 @@ from os import path -__version__ = '1.3.2' +__version__ = '1.3.3' def get_html_theme_path(): diff --git a/dask_sphinx_theme/layout.html b/dask_sphinx_theme/layout.html index 17e1cfd..a1d65af 100644 --- a/dask_sphinx_theme/layout.html +++ b/dask_sphinx_theme/layout.html @@ -1,9 +1,4 @@ -{# TEMPLATE VAR SETTINGS #} -{%- set url_root = pathto('', 1) %} -{%- if url_root == '#' %}{% set url_root = '' %}{% endif %} -{%- set lang_attr = 'en' if language == None else (language | replace('_', '-')) %} - -{# XXX: Should revert back to theme inhritence if readthedocs/sphinx_rtd_theme#853 is ever merged #} +{% extends "sphinx_rtd_theme/layout.html" %} {% set css_files = css_files + ["_static/css/explore.css"] %} {% set css_files = css_files + ["_static/css/nbsphinx.css"] %} @@ -11,25 +6,6 @@ {% set script_files = script_files + ["_static/js/custom.js"] %} - - - - {{ metatags }} - - {% block htmltitle %} - {{ title|striptags|e }} - {% endblock %} - - {# FAVICON #} - {% if favicon %} - - {% endif %} - - {# CANONICAL URL #} - {% if theme_canonical_url %} - - {% endif %} - {# SOCIAL GRAPH #} @@ -49,85 +25,6 @@ - {# CSS #} - - - {%- for css in css_files %} - {%- if css|attr("rel") %} - - {%- else %} - - {%- endif %} - {%- endfor %} - - {%- for cssfile in extra_css_files %} - - {%- endfor %} - - {# JAVASCRIPTS #} - {%- block scripts %} - - {%- if not embedded %} - {# XXX Sphinx 1.8.0 made this an external js-file, quick fix until we refactor the template to inherert more blocks directly from sphinx #} - {% if sphinx_version >= "1.8.0" %} - - {%- for scriptfile in script_files %} - {{ js_tag(scriptfile) }} - {%- endfor %} - {% else %} - - {%- for scriptfile in script_files %} - - {%- endfor %} - {% endif %} - - - {# OPENSEARCH #} - {%- if use_opensearch %} - - {%- endif %} - {%- endif %} - {%- endblock %} - - {%- block linktags %} - {%- if hasdoc('about') %} - - {%- endif %} - {%- if hasdoc('genindex') %} - - {%- endif %} - {%- if hasdoc('search') %} - - {%- endif %} - {%- if hasdoc('copyright') %} - - {%- endif %} - {%- if next %} - - {%- endif %} - {%- if prev %} - - {%- endif %} - {%- endblock %} - {%- block extrahead %} - - {% endblock %} - - {% block extrabody %}