From 0c48261097be9b1d5d90420cff623c562edc8d3c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 15 Dec 2017 23:34:50 +0100 Subject: [PATCH] theme: minor code reorganization and unification. No effect on anything. --- pelican-theme/templates/archives.html | 4 ++-- .../templates/base_blog_section.html | 4 ++-- pelican-theme/templates/page.html | 20 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pelican-theme/templates/archives.html b/pelican-theme/templates/archives.html index 41b76109..cf219696 100644 --- a/pelican-theme/templates/archives.html +++ b/pelican-theme/templates/archives.html @@ -7,7 +7,7 @@ {% if articles_page and articles_page.has_next() %} {% endif %} -{% endblock head_links %} +{% endblock %} {% block content %}
@@ -50,4 +50,4 @@ {{ pagination()|indent(6) }} {% endif %}
-{% endblock content %} +{% endblock %} diff --git a/pelican-theme/templates/base_blog_section.html b/pelican-theme/templates/base_blog_section.html index a4c71c4a..4717235c 100644 --- a/pelican-theme/templates/base_blog_section.html +++ b/pelican-theme/templates/base_blog_section.html @@ -7,7 +7,7 @@ {% if articles_page.has_next() %} {% endif %} -{% endblock head_links %} +{% endblock %} {% block content %}
@@ -29,4 +29,4 @@ {{ pagination()|indent(6) }} {% endif %}
-{% endblock content %} +{% endblock %} diff --git a/pelican-theme/templates/page.html b/pelican-theme/templates/page.html index 3ea346c2..a297dd9d 100644 --- a/pelican-theme/templates/page.html +++ b/pelican-theme/templates/page.html @@ -13,6 +13,16 @@ {% endif %} {% endblock %} +{% block head_links %} + {{- super() -}} + {% if page.css %} + {% set styles = page.css.strip().split('\n') %} + {% for style in styles %} + + {% endfor %} + {% endif %} +{% endblock %} + {% block head %} {{- super() -}} {% if page.description %} @@ -36,16 +46,6 @@ {% endblock %} -{% block head_links %} - {{- super() -}} - {% if page.css %} - {% set styles = page.css.strip().split('\n') %} - {% for style in styles %} - - {% endfor %} - {% endif %} -{% endblock %} - {% block main %} {% if not page.landing and page.header %}
-- 2.30.2