]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Revert part of #1220 revert-1220-url-filter 1231/head
authornodiscc <nodiscc@gmail.com>
Tue, 9 Oct 2018 17:31:39 +0000 (17:31 +0000)
committernodiscc <nodiscc@gmail.com>
Tue, 9 Oct 2018 17:35:56 +0000 (19:35 +0200)
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/

doc/custom_theme/main.html

index 69b398f6cc6f67be717620b9f814e7660501c8e2..cc2a703e75c2b003b491076325855b163a84af79 100644 (file)
@@ -20,6 +20,4 @@ the blocks defined in base.html and its included child templates.
 
 {% if page and page.is_homepage %}<meta name="description" content="{{ config.site_description }}">{% endif %}
 {% if config.site_author %}<meta name="author" content="{{ config.site_author }}">{% endif %}
-{% if config.site_favicon %}<link rel="shortcut icon" href="{{ config.site_favicon|url }}">
-{% else %}<link rel="shortcut icon" href="{{ 'img/favicon.ico'|url }}">{% endif %}
 {%- endblock %}