aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornodiscc <nodiscc@gmail.com>2018-10-09 17:31:39 +0000
committernodiscc <nodiscc@gmail.com>2018-10-09 19:35:56 +0200
commit8b2afee16bf5a4df4323ad89c1e9a68ae4756014 (patch)
tree8b4cac92c17dabff27000470bd347689ffa962de
parente95247d41dbe3b46c83d97f2a9d0e7bd1194bf08 (diff)
downloadShaarli-revert-1220-url-filter.tar.gz
Shaarli-revert-1220-url-filter.tar.zst
Shaarli-revert-1220-url-filter.zip
Revert part of #1220revert-1220-url-filter
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/
-rw-r--r--doc/custom_theme/main.html2
1 files changed, 0 insertions, 2 deletions
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.
20 20
21{% if page and page.is_homepage %}<meta name="description" content="{{ config.site_description }}">{% endif %} 21{% if page and page.is_homepage %}<meta name="description" content="{{ config.site_description }}">{% endif %}
22{% if config.site_author %}<meta name="author" content="{{ config.site_author }}">{% endif %} 22{% if config.site_author %}<meta name="author" content="{{ config.site_author }}">{% endif %}
23{% if config.site_favicon %}<link rel="shortcut icon" href="{{ config.site_favicon|url }}">
24{% else %}<link rel="shortcut icon" href="{{ 'img/favicon.ico'|url }}">{% endif %}
25{%- endblock %} 23{%- endblock %}