From: nodiscc Date: Tue, 9 Oct 2018 17:31:39 +0000 (+0000) Subject: Revert part of #1220 X-Git-Tag: v0.10.3~2^2~10^2 X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=8b2afee16bf5a4df4323ad89c1e9a68ae4756014 Revert part of #1220 Fixes #1177 The `url` template filter is [only supported in Mkdocs 1.0+](https://github.com/mkdocs/mkdocs/blob/master/docs/about/release-notes.md#internal-refactor-of-pages-files-and-navigation) Readthedocs.org uses Mkdocs `0.17.3 ` while `make htmldoc` fetches the [latest version from pypi](https://pypi.org/project/mkdocs/) which is `1.0.4`. Following https://github.com/shaarli/Shaarli/pull/1220, building the docs fails with https://readthedocs.org/projects/shaarli/builds/7886340/ --- diff --git a/doc/custom_theme/main.html b/doc/custom_theme/main.html index 69b398f6..cc2a703e 100644 --- a/doc/custom_theme/main.html +++ b/doc/custom_theme/main.html @@ -20,6 +20,4 @@ the blocks defined in base.html and its included child templates. {% if page and page.is_homepage %}{% endif %} {% if config.site_author %}{% endif %} -{% if config.site_favicon %} -{% else %}{% endif %} {%- endblock %}