From 9029045412461cf0c10998142984e886d9e2f1fd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 11 Sep 2017 13:19:54 +0200 Subject: [PATCH] theme: various updates. Fixed code indentation on a bunch of places, got rid of TAGCLOUD_LEVELS as the style had it hardcoded anyway, adapted to padding changes in the CSS style. --- pelican-theme/templates/article.html | 79 +++++++++++++------------- pelican-theme/templates/base.html | 2 +- pelican-theme/templates/base_blog.html | 42 +++++++------- pelican-theme/templates/page.html | 2 +- 4 files changed, 63 insertions(+), 62 deletions(-) diff --git a/pelican-theme/templates/article.html b/pelican-theme/templates/article.html index 890bae7c..0f9aac3c 100644 --- a/pelican-theme/templates/article.html +++ b/pelican-theme/templates/article.html @@ -23,61 +23,62 @@ {% endblock %} {% block content %} - {% if article.cover %} -
-
-
-
-
-
-
{{ article.locale_date }}
-
{% for author in article.authors %}{{ author }}{% endfor %}
-
-
-
- {% set title = article.title.split(' — ') %} -

+ {% if article.cover %} +

+ {% if title|length >= 2 %} +

{{ title[1] }}

+ {% endif %}
-
-
-
- {{ article.summary }} -
-
-
-
-
+
+
+ {{ article.summary|indent(12) }} +
+
+
+ +
+
+
-{{ article.content }} +{{ article.content -}} -
-
-
-
-

Posted {% if article.authors %}by {% for author in article.authors %}{{ author }}{% endfor %}{% endif %} on in {{ article.category }}.{% if article.tags %} Tags: {% for tag in article.tags %}{{ tag }}{% if not loop.last %}, {% endif %}{% endfor %}.{% endif %}

-
+
+
+
+
+

Posted {% if article.authors %}by {% for author in article.authors %}{{ author }}{% endfor %}{% endif %} on in {{ article.category }}.{% if article.tags %} Tags: {% for tag in article.tags %}{{ tag }}{% if not loop.last %}, {% endif %}{% endfor %}.{% endif %}

-
-
- {% else %} -
+ + +
+ {% else %} +
{% macro header() %}{% include "article_header.html" %}{% endmacro %} {{ header()|indent(6) }}
-{{ article.content }} +{{ article.content -}} {% macro footer() %}{% include "article_footer.html" %}{% endmacro %} {{ footer()|indent(6) }} diff --git a/pelican-theme/templates/base.html b/pelican-theme/templates/base.html index 1c4b039d..c76c0059 100644 --- a/pelican-theme/templates/base.html +++ b/pelican-theme/templates/base.html @@ -37,7 +37,7 @@ {% if sub %}
    {% for title, link in sub %} -
  1. {{ title }}
    2. +
  2. {{ title }}
    3. {% endfor %}
{% endif %} diff --git a/pelican-theme/templates/base_blog.html b/pelican-theme/templates/base_blog.html index c421ac4d..b0500088 100644 --- a/pelican-theme/templates/base_blog.html +++ b/pelican-theme/templates/base_blog.html @@ -12,27 +12,27 @@ {% block content %} {% endblock %} {% if article and article.cover %} - + {% else %} diff --git a/pelican-theme/templates/page.html b/pelican-theme/templates/page.html index 87000ff2..a8af6fd8 100644 --- a/pelican-theme/templates/page.html +++ b/pelican-theme/templates/page.html @@ -16,7 +16,7 @@

{{ page.title }}

-{{ page.content }} +{{ page.content -}}
-- 2.30.2