theme: minor code reorganization and unification.

No effect on anything.

diff --git a/pelican-theme/templates/archives.html b/pelican-theme/templates/archives.html
index 41b7610901440e48a55a38fbbc7eac648d8792ef..cf2196963f89a8920680ea8c2b1491bab1f63de0 100644 (file)
--- a/pelican-theme/templates/archives.html
+++ b/pelican-theme/templates/archives.html
@@ -7,7 +7,7 @@
   {% if articles_page and articles_page.has_next() %}
   <link rel="next" href="{{ articles_next_page.url|format_siteurl|e }}" />
   {% endif %}
-{% endblock head_links %}
+{% endblock %}
 
 {% block content %}
     <div class="m-col-m-10">
@@ -50,4 +50,4 @@
       {{ pagination()|indent(6) }}
       {% endif %}
     </div>
-{% endblock content %}
+{% endblock %}

diff --git a/pelican-theme/templates/base_blog_section.html b/pelican-theme/templates/base_blog_section.html
index a4c71c4a3ffa7bb4f782d4b9d6757a09e0a55e72..4717235c56f7db685c3c9ae5b7d7d2fd7a24ffc9 100644 (file)
--- 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() %}
   <link rel="next" href="{{ articles_next_page.url|format_siteurl|e }}" />
   {% endif %}
-{% endblock head_links %}
+{% endblock %}
 
 {% block content %}
     <div class="m-col-m-10">
@@ -29,4 +29,4 @@
       {{ pagination()|indent(6) }}
       {% endif %}
     </div>
-{% endblock content %}
+{% endblock %}

diff --git a/pelican-theme/templates/page.html b/pelican-theme/templates/page.html
index 3ea346c25f41c339e63b2d77814d3e8ee587b1ff..a297dd9df0a71358e610787ea3e57ff1cd2c7b56 100644 (file)
--- 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 %}
+  <link rel="stylesheet" href="{{ style|expand_link(page)|e }}" />
+  {% endfor %}
+  {% endif %}
+{% endblock %}
+
 {% block head %}
   {{- super() -}}
   {% if page.description %}
@@ -36,16 +46,6 @@
   <meta property="og:type" content="website" />
 {% endblock %}
 
-{% block head_links %}
-  {{- super() -}}
-  {% if page.css %}
-  {% set styles = page.css.strip().split('\n') %}
-  {% for style in styles %}
-  <link rel="stylesheet" href="{{ style|expand_link(page)|e }}" />
-  {% endfor %}
-  {% endif %}
-{% endblock %}
-
 {% block main %}
 {% if not page.landing and page.header %}
 <div class="m-container m-container-inflatable">