diff --git a/_includes/date-easter.html b/_includes/date-easter.html index 98f1d26..e9720cd 100644 --- a/_includes/date-easter.html +++ b/_includes/date-easter.html @@ -4,7 +4,7 @@
{% for E in S[current_date] %} {% if E.link %} - {{E.emoji}} + {{E.emoji}} {% else %} {{E.emoji}} {% endif %} @@ -12,7 +12,7 @@ {% for E in S[current_date_with_year] %} {% if E.link %} - {{E.emoji}} + {{E.emoji}} {% else %} {{E.emoji}} {% endif %} diff --git a/_includes/date.html b/_includes/date.html new file mode 100644 index 0000000..7f73660 --- /dev/null +++ b/_includes/date.html @@ -0,0 +1,3 @@ +
+{% include date-easter.html %} +
\ No newline at end of file diff --git a/_includes/style.css b/_includes/style.css index 62d82a6..2adfcad 100644 --- a/_includes/style.css +++ b/_includes/style.css @@ -192,7 +192,7 @@ mark { display: none; } -.emoji-representation { +.emoji-representation, .emoji-representation>a{ display: inline; text-decoration: none; font-style: normal; diff --git a/_layouts/article.html b/_layouts/article.html index 592f3be..f21cbb6 100644 --- a/_layouts/article.html +++ b/_layouts/article.html @@ -10,8 +10,7 @@ layout: default

{{page.title | strip}}

{% if page.sources%}

{{page.sources | join: " "}}

{%endif%} - - {% include date-easter.html %} + {% include date.html %}
diff --git a/_layouts/topic.html b/_layouts/topic.html index 6bf21eb..64c2e7f 100644 --- a/_layouts/topic.html +++ b/_layouts/topic.html @@ -7,10 +7,7 @@ layout: default

{{page.title | capitalize | strip}}

-
- - {% include date-easter.html %} -
+{% include date.html %} {% if page.article_count == 0 %}

No articles today under {{page.title}}

diff --git a/index.html b/index.html index 33bdc98..2cfdc97 100644 --- a/index.html +++ b/index.html @@ -5,13 +5,11 @@ layout: default

{{page.title}}

-
-{% include date-easter.html %} -
+{% include date.html %} {% for T in site.data.topics %} {% assign post_count = T[1] %} {% if post_count > 0 %} -
+

{{T[0] | capitalize}}

{% for post in site.pages %} {% if post.topics and post.topics.first == T[0] %}