chiark / gitweb /
~cjwatson / blog.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4339f98)
theme: more harmless template updates.
authorVladimír Vondruš <mosra@centrum.cz>
Sat, 16 Dec 2017 01:22:19 +0000 (02:22 +0100)
committerVladimír Vondruš <mosra@centrum.cz>
Sat, 16 Dec 2017 10:38:14 +0000 (11:38 +0100)
pelican-theme/templates/article.html patch | blob | history
pelican-theme/templates/base.html patch | blob | history
pelican-theme/templates/page.html patch | blob | history

diff --git a/pelican-theme/templates/article.html b/pelican-theme/templates/article.html
index d5c7f8eb59390b2b381f9e6d8000eb102dca2c9d..bdef82a8f9315d6cb76e0f37d5696abbf0830239 100644 (file)
--- a/pelican-theme/templates/article.html
+++ b/pelican-theme/templates/article.html
@@ -6,8 +6,7 @@
   <link rel="canonical" href="{{ article.url|format_siteurl|e }}" />
 {% endblock %}
 
-{% block head %}
-  {{- super() -}}
+{% block social %}
   {% if article.description %}
   <meta name="description" content="{{ article.description|dehyphenate|striptags|e }}" />
   {% endif %}
diff --git a/pelican-theme/templates/base.html b/pelican-theme/templates/base.html
index 97a2bc0605f66bbddcc0c0cbe9a1ac009317c96d..46d14fcc789e6710679fd5caa7cbc50e5ca540ed 100644 (file)
--- a/pelican-theme/templates/base.html
+++ b/pelican-theme/templates/base.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html lang="{% if page and page.lang %}{{ page.lang }}{% elif article and article.lang %}{{ article.lang }}{% else %}{{ DEFAULT_LANG }}{%endif %}">
 <head>
-  {% block head %}
   <meta charset="UTF-8" />
   <title>{% block title %}{{ SITENAME|e }}{% endblock title %}</title>
   {% for href in M_CSS_FILES %}
@@ -19,7 +18,8 @@
   {% if M_THEME_COLOR %}
   <meta name="theme-color" content="{{ M_THEME_COLOR }}" />
   {% endif %}
-  {% endblock head %}
+  {% block social %}
+  {% endblock social %}
 </head>
 <body>
 <header><nav id="navigation"{% if page and page.landing and page.cover %} class="m-navbar-landing"{% endif %}{% if article and article.cover %} class="m-navbar-jumbo"{% endif %}>
diff --git a/pelican-theme/templates/page.html b/pelican-theme/templates/page.html
index 61f1670c6e51ae3921d80c01df0eefd9190a6592..c61e78408c6e2cd44907e5856224c4892aa124dc 100644 (file)
--- a/pelican-theme/templates/page.html
+++ b/pelican-theme/templates/page.html
@@ -23,8 +23,7 @@
   <link rel="canonical" href="{{ page.url|format_siteurl|e }}" />
 {% endblock %}
 
-{% block head %}
-  {{- super() -}}
+{% block social %}
   {% if page.description %}
   <meta name="description" content="{{ page.description|dehyphenate|striptags|e }}" />
   {% endif %}
Colin Watson's blog