From e5cb408bb1390db2aeba063fa357491e1fec4b1a Mon Sep 17 00:00:00 2001 From: Peter Molnar Date: Fri, 1 Jun 2018 09:48:03 +0000 Subject: [PATCH] bye \t --- templates/Category.html | 174 ++++++++++---------- templates/Category_article.html | 76 ++++----- templates/Comment.html | 42 ++--- templates/Search.html | 66 ++++---- templates/Singular.html | 259 +++++++++++++++--------------- templates/Singular_title.html | 24 +-- templates/block_footer.html | 88 +++++----- templates/block_header_close.html | 94 +++++------ templates/block_header_open.html | 12 +- templates/style-dark.css | 25 +-- 10 files changed, 421 insertions(+), 439 deletions(-) diff --git a/templates/Category.html b/templates/Category.html index a8f3111..e03a439 100644 --- a/templates/Category.html +++ b/templates/Category.html @@ -1,120 +1,120 @@ {% include 'block_header_open.html' %} - {{ taxonomy.title }} - - + {{ taxonomy.title }} + + {% include 'block_header_close.html' %} {% if taxonomy.add_welcome %} {% endif %}
- + -

{{ taxonomy.name }}

- {% for post in posts %} -
-
-

{% include 'Singular_title.html' %}

-
+

{{ taxonomy.name }}

+ {% for post in posts %} + + {% if post.summary %} +
+ {{ post.summary }} + + + {% if post.lang == 'hu' %}Tovább »{% else %}Continue »{% endif %} + + +
+ {% else %} +
+ {% if post.photo %} + {{ post.photo }} + {% endif %} + {{ post.html }} +
+ {% endif %} +
- {% endfor %} + {% endfor %}
{% if taxonomy.total > 1 %} - {# based on: http://dev.dbl-a.com/symfony-2-0/symfony2-and-twig-pagination/ #} - {% endif %} diff --git a/templates/Category_article.html b/templates/Category_article.html index 02bec3b..c837f85 100644 --- a/templates/Category_article.html +++ b/templates/Category_article.html @@ -1,50 +1,50 @@ {% include 'block_header_open.html' %} - {{ taxonomy.title }} - - + {{ taxonomy.title }} + + {% include 'block_header_close.html' %}
- + -

{{ taxonomy.name }}

+

{{ taxonomy.name }}

{% for year in by_year.keys()|sort(reverse=True) %} -

{{ year }}

- {% for post in by_year[year]|sort(attribute='pubtime',reverse=True) %} -
-
-

{% include 'Singular_title.html' %}

-
+

{{ year }}

+ {% for post in by_year[year]|sort(attribute='pubtime',reverse=True) %} + - {% endfor %} + {% if post.summary %} +
+ {{ post.summary }} + + + {% if post.lang == 'hu' %}Tovább »{% else %}Continue »{% endif %} + + +
+
+ {% else %} +
+ {% if post.photo %} + {{ post.photo }} + {% endif %} + {{ post.html }} +
+ {% endif %} +
+ {% endfor %} {% endfor %}
diff --git a/templates/Comment.html b/templates/Comment.html index e3d1aa8..3d97825 100644 --- a/templates/Comment.html +++ b/templates/Comment.html @@ -1,27 +1,27 @@
  • {% if 'webmention' != comment.type %} - - {{ comment.type }} - + + {{ comment.type }} + {% endif %} - from - - {% if comment.author.url %} - - {{ comment.author.name }} - - {% else %} - {{ comment.author.name }} - {% endif %} -
    + from + + {% if comment.author.url %} + + {{ comment.author.name }} + + {% else %} + {{ comment.author.name }} + {% endif %} +
    {% if 'webmention' == comment.type %} - - - - - {{ comment.source }} - + + + + + {{ comment.source }} + {% endif %}
    • diff --git a/templates/Search.html b/templates/Search.html index 888476d..af6e658 100644 --- a/templates/Search.html +++ b/templates/Search.html @@ -1,51 +1,51 @@ - - - - Search results for "{{ term }}" + + + + Search results for "{{ term }}"
    - + - + -
    +
    -

    Search results for "{{ term }}"

    +

    Search results for "{{ term }}"

    {% for category, posts in results.items() %} -
    - {{ category }} [{{ posts|length }}] -
      - {% for fname, post in posts.items() %} -
    1. -

      {{ post.url }}

      -

      {% if post.title|e %}{{ post.txt }}{% else %}{{ post.title }}{% endif %}

      -
      2. - {% endfor %} -
    -
    +
    + {{ category }} [{{ posts|length }}] +
      + {% for fname, post in posts.items() %} +
    1. +

      {{ post.url }}

      +

      {% if post.title|e %}{{ post.txt }}{% else %}{{ post.title }}{% endif %}

      +
      2. + {% endfor %} +
    +
    {% endfor %}
    diff --git a/templates/Singular.html b/templates/Singular.html index d0e3ea5..5a5d6f9 100644 --- a/templates/Singular.html +++ b/templates/Singular.html @@ -1,160 +1,155 @@ {% include 'block_header_open.html' %} - {{ post.title }} - - - + {{ post.title }} + + + - - - + + + {% include 'block_header_close.html' %}
    -
    -
    -

    {% include 'Singular_title.html' %}

    -
    +
    +
    +

    {% include 'Singular_title.html' %}

    +
    {% if post.review %} -
    -

    Review summary

    -

    - {{ post.review.title }} -

    -

    - - {{ post.review.rating }} - out of - 5 - -

    -

    {{ post.review.summary }}

    -
    +
    +

    Review summary

    +

    + {{ post.review.title }} +

    +

    + + {{ post.review.rating }} + out of + 5 + +

    +

    {{ post.review.summary }}

    +
    {% endif %} {% if post.summary %} -
    - {{ post.summary }} -
    -
    +
    + {{ post.summary }} +
    +
    {% endif %} -
    -
    - {% if post.photo %} - {{ post.photo }} - {% endif %} - {{ post.html }} -
    -
    +
    +
    + {% if post.photo %} + {{ post.photo }} + {% endif %} + {{ post.html }} +
    +
    -
    -
    -
    Published
    -
    - -
    -
    Author
    -
    - {% include 'block_author.html' %} -
    -
    Entry URL
    -
    - {{ site.url}}/{{ post.slug }}/ -
    -
    License
    -
    - {% if post.licence.text == 'CC BY 4.0' %} - CC BY 4.0 - - -
    - Licensed under Creative Commons Attribution 4.0 International. You are free to share or republish, even if modified, if you link back here and indicate the modifications, even for commercial use. - {% elif post.licence.text == 'CC BY-NC 4.0' %} - CC BY-NC 4.0 - - -
    - Licensed under Creative Commons Attribution-NonCommercial 4.0 International. You are free to share or republish, even if modified, if you link back here and indicate the modifications, for non commercial use. For commercial use please contact the author. - {% else %} - CC BY-NC-ND 4.0 - - -
    - Licensed under Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International. You are free to share if you link back here for non commercial use, but you can't publish any altered versions of it. For commercial use please contact the author. - {% endif %} -
    -
    Leave a tip
    -
    -

    - {% if post.category == 'photo' %} - Did you like this photo?
    Leave a tip! If you're interested in prints, please get in touch. - {% elif post.category == 'article' %} - Did you find this article useful?
    Support me, so I can write more like this.
    If you want my help for your project, get in touch. - {% elif post.category == 'journal' %} - Did you like this entry?
    Encourage me to write more of them. - {% else %} - Did you like what you read?
    Leave a tip! - {% endif %} -

    - -
    -
    +
    +
    +
    Published
    +
    + +
    +
    Author
    +
    + {% include 'block_author.html' %} +
    +
    Entry URL
    +
    + {{ site.url}}/{{ post.slug }}/ +
    +
    License
    +
    + {% if post.licence.text == 'CC BY 4.0' %} + + + CC BY 4.0 You are free to share or republish, even if modified, if you link back here and indicate the modifications, even for commercial use. + {% elif post.licence.text == 'CC BY-NC 4.0' %} + + + CC BY-NC 4.0 You are free to share or republish, even if modified, if you link back here and indicate the modifications, for non commercial use. For commercial use please contact the author. + {% else %} + + + CC BY-NC-ND 4.0 You are free to share if you link back here for non commercial use, but you can't publish any altered versions of it. For commercial use please contact the author. + {% endif %} +
    +
    Leave a tip
    +
    +

    + {% if post.category == 'photo' %} + Did you like this photo?
    Leave a tip! If you're interested in prints, please get in touch. + {% elif post.category == 'article' %} + Did you find this article useful?
    Support me, so I can write more like this.
    If you want my help for your project, get in touch. + {% elif post.category == 'journal' %} + Did you like this entry?
    Encourage me to write more of them. + {% else %} + Did you like what you read?
    Leave a tip! + {% endif %} +

    + +
    +
    +
    {% if post.syndicate|length %} - + {% endif %} {% if post.replies|length %} -
    -

    Replies

    -
      - {% for mtime, comment in post.replies %} - {% include 'Comment.html' %} - {% endfor %} -
    -
    +
    +

    Replies

    +
      + {% for mtime, comment in post.replies %} + {% include 'Comment.html' %} + {% endfor %} +
    +
    {% endif %} {% if post.reactions|length %} -
    -

    Reactions

    -
    - {% for character, comments in post.reactions.items() %} -
    {{ character }}
    -
    -
      - {% for mtime, comment in comments %} - {% include 'Comment.html' %} - {% endfor %} -
    -
    - {% endfor %} -
    -
    +
    +

    Reactions

    +
    + {% for character, comments in post.reactions.items() %} +
    {{ character }}
    +
    +
      + {% for mtime, comment in comments %} + {% include 'Comment.html' %} + {% endfor %} +
    +
    + {% endfor %} +
    +
    {% endif %} -
    +
    diff --git a/templates/Singular_title.html b/templates/Singular_title.html index 700ac41..b68ff53 100644 --- a/templates/Singular_title.html +++ b/templates/Singular_title.html @@ -1,15 +1,15 @@ {% if post.is_reply %} - - - - RE: - - - {{ post.is_reply }} - - + + + + RE: + + + {{ post.is_reply }} + + {% else %} - - {{ post.title }} - + + {{ post.title }} + {% endif %} diff --git a/templates/block_footer.html b/templates/block_footer.html index b2af476..7c51d5d 100644 --- a/templates/block_footer.html +++ b/templates/block_footer.html @@ -1,59 +1,59 @@ - {% include 'symbols.svg' %} - + diff --git a/templates/block_header_close.html b/templates/block_header_close.html index 1bd4d40..919eb3b 100644 --- a/templates/block_header_close.html +++ b/templates/block_header_close.html @@ -1,70 +1,70 @@ - +
    - - + -
    +
    diff --git a/templates/block_header_open.html b/templates/block_header_open.html index f90deed..39fd0a2 100644 --- a/templates/block_header_open.html +++ b/templates/block_header_open.html @@ -1,9 +1,9 @@ - - - - - - + + + + + + diff --git a/templates/style-dark.css b/templates/style-dark.css index 15b8032..96e735c 100644 --- a/templates/style-dark.css +++ b/templates/style-dark.css @@ -293,7 +293,7 @@ code.sourceCode span.va { color: turquoise; } .content-footer { margin-top: 2em; - padding: 1em 0 0.6em 0; + padding: 1.6em 0; text-align: center; } @@ -332,6 +332,8 @@ code.sourceCode span.va { color: turquoise; } .content-footer dl dd:last-of-type:after { content: ''; + display: none; + visibility: hidden; } input { @@ -455,25 +457,10 @@ input.search-submit:hover { color: #eee; } -.h-entry.singular footer dl, -.h-entry.singular footer dt, .h-entry.singular footer dd { - vertical-align:top; + margin: 0 0 1em 0; } -.h-entry.singular footer dt { - display: inline-block; - width: 18%; - margin: 0 1% 0 0; - text-align: right; -} - -.h-entry.singular footer dd { - display: inline-block; - width: 80%; -} - - .h-entry.singular footer img { width: 1em; height: auto; @@ -714,12 +701,12 @@ figcaption .author, h1, h2, h3, h4, h5, h6 { page-break-after: avoid; } - + h3, a, .footnotes ol li a, .h-feed .h-entry, - code, + code, pre { border: none; }