From cd45caa1e04e9611e94be623d2a875b7cdeae18a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 10 Dec 2017 15:40:56 +0100 Subject: [PATCH] theme: group all the elements together in . My OCD is happy. --- pelican-theme/templates/archives.html | 5 ++--- pelican-theme/templates/base.html | 10 ++++++---- pelican-theme/templates/base_blog_section.html | 5 ++--- pelican-theme/templates/page.html | 4 ++++ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pelican-theme/templates/archives.html b/pelican-theme/templates/archives.html index 7ae981db..bbcab8e7 100644 --- a/pelican-theme/templates/archives.html +++ b/pelican-theme/templates/archives.html @@ -1,14 +1,13 @@ {% extends "base_blog.html" %} -{% block head %} - {{- super() -}} +{% block head_links %} {% if articles_page and articles_page.has_previous() %} {% endif %} {% if articles_page and articles_page.has_next() %} {% endif %} -{% endblock head %} +{% endblock head_links %} {% block content %}
diff --git a/pelican-theme/templates/base.html b/pelican-theme/templates/base.html index f5335ae3..70042623 100644 --- a/pelican-theme/templates/base.html +++ b/pelican-theme/templates/base.html @@ -7,16 +7,18 @@ {% for href in M_CSS_FILES %} {% endfor %} - - {% if M_THEME_COLOR %} - - {% endif %} + {% block head_links %} + {% endblock head_links %} {% if FEED_ALL_ATOM_URL %} {% endif %} {% if CATEGORY_FEED_ATOM_URL and category %} {% endif %} + + {% if M_THEME_COLOR %} + + {% endif %} {% endblock head %} diff --git a/pelican-theme/templates/base_blog_section.html b/pelican-theme/templates/base_blog_section.html index 0f8d8432..194aaf9f 100644 --- a/pelican-theme/templates/base_blog_section.html +++ b/pelican-theme/templates/base_blog_section.html @@ -1,14 +1,13 @@ {% extends "base_blog.html" %} -{% block head %} - {{- super() -}} +{% block head_links %} {% if articles_page.has_previous() %} {% endif %} {% if articles_page.has_next() %} {% endif %} -{% endblock head %} +{% endblock head_links %} {% block content %}
diff --git a/pelican-theme/templates/page.html b/pelican-theme/templates/page.html index c50826da..935b3999 100644 --- a/pelican-theme/templates/page.html +++ b/pelican-theme/templates/page.html @@ -34,6 +34,10 @@ {% endif %} +{% endblock %} + +{% block head_links %} + {{- super() -}} {% if page.css %} {% set styles = page.css.strip().split('\n') %} {% for style in styles %} -- 2.30.2