From 79f34d360cc324926ea1e0b95c6660ab37718cf0 Mon Sep 17 00:00:00 2001 From: erciccione Date: Tue, 2 Jun 2020 18:33:26 +0200 Subject: [PATCH] Blog: Use only one 'Blog' menu and add category selector - Added separator between posts - remove all submenus and use only 'blog' - Add category selector for desktop and mobile --- _data/lang/ar/navigation.yml | 14 +----- _data/lang/de/navigation.yml | 14 +----- _data/lang/en/navigation.yml | 14 +----- _data/lang/es/navigation.yml | 14 +----- _data/lang/fr/navigation.yml | 14 +----- _data/lang/it/navigation.yml | 14 +----- _data/lang/nl/navigation.yml | 14 +----- _data/lang/pl/navigation.yml | 14 +----- _data/lang/pt-br/navigation.yml | 14 +----- _data/lang/ru/navigation.yml | 14 +----- _data/lang/tr/navigation.yml | 14 +----- _data/lang/zh-cn/navigation.yml | 14 +----- _data/lang/zh-tw/navigation.yml | 14 +----- _i18n/en.yml | 11 +++-- _layouts/blog_by_tag.html | 59 +++++++++++++++++----- blog/index.html | 86 ++++++++++++++++++++++----------- css/custom.css | 37 ++++++++++++++ 17 files changed, 175 insertions(+), 200 deletions(-) diff --git a/_data/lang/ar/navigation.yml b/_data/lang/ar/navigation.yml index 3ef9ced7..c7c3362c 100644 --- a/_data/lang/ar/navigation.yml +++ b/_data/lang/ar/navigation.yml @@ -14,18 +14,8 @@ url: get-started/faq - title: التنزيلات url: downloads/ -- title: آخر الأخبار - subfolderitems: - - page: Urgent - url: blog/tags/urgent.html - - page: الإصدارات - url: blog/tags/releases.html - - page: Community - url: blog/tags/community.html - - page: سجل الإجتماعات - url: blog/tags/dev%20diaries.html - - page: جميع المشاركات - url: blog +- title: Blog + url: blog - title: المجتمع subfolderitems: - page: الفريق diff --git a/_data/lang/de/navigation.yml b/_data/lang/de/navigation.yml index f22cdf3f..867a80fd 100644 --- a/_data/lang/de/navigation.yml +++ b/_data/lang/de/navigation.yml @@ -14,18 +14,8 @@ url: get-started/faq - title: Downloads url: downloads/ -- title: Neuigkeiten - subfolderitems: - - page: Dringend - url: blog/tags/urgent.html - - page: Versionen - url: blog/tags/releases.html - - page: Gemeinschaft - url: blog/tags/community.html - - page: Protokolle - url: blog/tags/dev%20diaries.html - - page: Alle Einträge - url: blog +- title: Blog + url: blog - title: Community subfolderitems: - page: Team diff --git a/_data/lang/en/navigation.yml b/_data/lang/en/navigation.yml index 8069811e..9eca8656 100644 --- a/_data/lang/en/navigation.yml +++ b/_data/lang/en/navigation.yml @@ -14,18 +14,8 @@ url: get-started/faq - title: Downloads url: downloads/ -- title: Recent News - subfolderitems: - - page: Urgent - url: blog/tags/urgent.html - - page: Releases - url: blog/tags/releases.html - - page: Community - url: blog/tags/community.html - - page: Meeting Logs - url: blog/tags/dev%20diaries.html - - page: All Posts - url: blog +- title: Blog + url: blog - title: Community subfolderitems: - page: Team diff --git a/_data/lang/es/navigation.yml b/_data/lang/es/navigation.yml index b2e7315a..ba4b1c2b 100644 --- a/_data/lang/es/navigation.yml +++ b/_data/lang/es/navigation.yml @@ -14,18 +14,8 @@ url: get-started/faq - title: Descargas url: downloads -- title: Noticias - subfolderitems: - - page: Urgente - url: blog/tags/urgent.html - - page: Lanzamientos - url: blog/tags/releases.html - - page: Comunidad - url: blog/tags/community.html - - page: Transcripciones de reuniones - url: blog/tags/dev%20diaries.html - - page: Todas publicaciones - url: blog +- title: Blog + url: blog - title: Comunidad subfolderitems: - page: Equipo diff --git a/_data/lang/fr/navigation.yml b/_data/lang/fr/navigation.yml index 801326f1..40ffca76 100644 --- a/_data/lang/fr/navigation.yml +++ b/_data/lang/fr/navigation.yml @@ -14,18 +14,8 @@ url: get-started/faq - title: Téléchargements url: downloads/ -- title: Actualités - subfolderitems: - - page: Urgent - url: blog/tags/urgent.html - - page: Versions - url: blog/tags/releases.html - - page: Communauté - url: blog/tags/community.html - - page: Comptes-rendus de Réunions - url: blog/tags/dev%20diaries.html - - page: Toutes - url: blog +- title: Blog + url: blog - title: Communauté subfolderitems: - page: Équipe diff --git a/_data/lang/it/navigation.yml b/_data/lang/it/navigation.yml index 632b2318..ebdf61ed 100644 --- a/_data/lang/it/navigation.yml +++ b/_data/lang/it/navigation.yml @@ -14,18 +14,8 @@ url: get-started/faq - title: Download url: downloads/ -- title: Notizie recenti - subfolderitems: - - page: Urgente - url: blog/tags/urgent.html - - page: Uscite - url: blog/tags/releases.html - - page: Comunità - url: blog/tags/community.html - - page: Log dei meeting - url: blog/tags/dev%20diaries.html - - page: Tutti i post - url: blog +- title: Blog + url: blog - title: Comunità subfolderitems: - page: Team diff --git a/_data/lang/nl/navigation.yml b/_data/lang/nl/navigation.yml index 89c27926..13239da6 100644 --- a/_data/lang/nl/navigation.yml +++ b/_data/lang/nl/navigation.yml @@ -14,18 +14,8 @@ url: get-started/faq - title: Downloads url: downloads/ -- title: Nieuws - subfolderitems: - - page: Urgent - url: blog/tags/urgent.html - - page: Releases - url: blog/tags/releases.html - - page: Community - url: blog/tags/community.html - - page: Vergaderingen - url: blog/tags/dev%20diaries.html - - page: Alles - url: blog +- title: Blog + url: blog - title: Community subfolderitems: - page: Team diff --git a/_data/lang/pl/navigation.yml b/_data/lang/pl/navigation.yml index 37a93057..9e3cf8d5 100644 --- a/_data/lang/pl/navigation.yml +++ b/_data/lang/pl/navigation.yml @@ -14,18 +14,8 @@ url: get-started/faq - title: Downloads url: downloads/ -- title: Najnowsze - subfolderitems: - - page: Ważne - url: blog/tags/urgent.html - - page: Aktualizacje - url: blog/tags/releases.html - - page: Społeczność - url: blog/tags/community.html - - page: Zapisy z czatów - url: blog/tags/dev%20diaries.html - - page: Wszystkie wpisy - url: blog +- title: Blog + url: blog - title: Społeczność subfolderitems: - page: Zespół diff --git a/_data/lang/pt-br/navigation.yml b/_data/lang/pt-br/navigation.yml index dac94ef7..ff4f2f4e 100644 --- a/_data/lang/pt-br/navigation.yml +++ b/_data/lang/pt-br/navigation.yml @@ -14,18 +14,8 @@ url: get-started/faq - title: Downloads url: downloads/ -- title: Notícias - subfolderitems: - - page: Urgente - url: blog/tags/urgent.html - - page: Lançamentos - url: blog/tags/releases.html - - page: Comunidade - url: blog/tags/community.html - - page: Logs das Reuniões - url: blog/tags/dev%20diaries.html - - page: Todos os Posts - url: blog +- title: Blog + url: blog - title: Comunidade subfolderitems: - page: Equipe diff --git a/_data/lang/ru/navigation.yml b/_data/lang/ru/navigation.yml index 580ba17a..60f778ec 100644 --- a/_data/lang/ru/navigation.yml +++ b/_data/lang/ru/navigation.yml @@ -14,18 +14,8 @@ url: get-started/faq - title: Загрузки url: downloads/ -- title: Последние новости - subfolderitems: - - page: Срочные - url: blog/tags/urgent.html - - page: Релизы - url: blog/tags/releases.html - - page: Сообщество - url: blog/tags/community.html - - page: Журналы встреч - url: blog/tags/dev%20diaries.html - - page: Все новости - url: blog +- title: Blog + url: blog - title: Сообщество subfolderitems: - page: Команда diff --git a/_data/lang/tr/navigation.yml b/_data/lang/tr/navigation.yml index d6804294..ba283b19 100644 --- a/_data/lang/tr/navigation.yml +++ b/_data/lang/tr/navigation.yml @@ -14,18 +14,8 @@ url: get-started/faq - title: İndirmeler url: downloads/ -- title: Son Haberler - subfolderitems: - - page: Urgent - url: blog/tags/urgent.html - - page: Bültenler - url: blog/tags/releases.html - - page: Community - url: blog/tags/community.html - - page: Toplantı Kayıtları - url: blog/tags/dev%20diaries.html - - page: Tüm Gönderiler - url: blog +- title: Blog + url: blog - title: Topluluk subfolderitems: - page: Ekip diff --git a/_data/lang/zh-cn/navigation.yml b/_data/lang/zh-cn/navigation.yml index b568c49d..f403d402 100644 --- a/_data/lang/zh-cn/navigation.yml +++ b/_data/lang/zh-cn/navigation.yml @@ -14,18 +14,8 @@ url: get-started/faq - title: 下载 url: downloads/ -- title: 最新资讯 - subfolderitems: - - page: Urgent - url: blog/tags/urgent.html - - page: 发布 - url: blog/tags/releases.html - - page: Community - url: blog/tags/community.html - - page: 会议记录 - url: blog/tags/dev%20diaries.html - - page: 所有文章 - url: blog +- title: Blog + url: blog - title: 社区 subfolderitems: - page: 团队 diff --git a/_data/lang/zh-tw/navigation.yml b/_data/lang/zh-tw/navigation.yml index dd52a537..5fe4fd2c 100644 --- a/_data/lang/zh-tw/navigation.yml +++ b/_data/lang/zh-tw/navigation.yml @@ -14,18 +14,8 @@ url: get-started/faq - title: 下載 url: downloads/ -- title: 最新消息 - subfolderitems: - - page: Urgent - url: blog/tags/urgent.html - - page: 版本發佈 - url: blog/tags/releases.html - - page: Community - url: blog/tags/community.html - - page: 會議記錄 - url: blog/tags/dev%20diaries.html - - page: 所有文章 - url: blog +- title: Blog + url: blog - title: 社群 subfolderitems: - page: 合作團隊 diff --git a/_i18n/en.yml b/_i18n/en.yml index 72cfadd9..07a2ce06 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -670,12 +670,15 @@ moneropedia: wallet: Wallet blog: - title_1: All - title_2: Blog - title_3: Posts + allposts: All Posts + urgent: Urgent + releases: Releases + community: Community + meetinglogs: Meeting Logs author: Posted by date: Posted at - forum: Click here to join the discussion for this entry on the Monero Forum + filter: "Filter by category:" + tags: notags: There are no posts for this tag. diff --git a/_layouts/blog_by_tag.html b/_layouts/blog_by_tag.html index 7d1b7bed..cd4ae8a2 100644 --- a/_layouts/blog_by_tag.html +++ b/_layouts/blog_by_tag.html @@ -9,21 +9,55 @@ layout: custom {% endif %} {% endfor %} +
+ +
+
+
{% t blog.allposts %}
+
{% t blog.urgent %}
+
{% t blog.releases %}
+
{% t blog.community %}
+
{% t blog.meetinglogs %}
+
+
+ + +
+ +
+ +
+
-
+
-
-

{{ tag.name }}

-
-
- +
+ {% if tag.name != "Dev Diaries" %} +

{{ tag.name }}

+ {% else %} +

{% t blog.meetinglogs %}

+ {% endif %} +
+
{% if site.tags[tag.slug] %} - {% for post in site.tags[tag.slug] %} -
+ {% for post in site.tags[tag.slug] %} +

{{ post.title }}

{{ post.summary }} @@ -33,10 +67,11 @@ layout: custom

- {% endfor %} - {% else %} -

{% t tags.notags %}

- {% endif %} + + {% endfor %} + {% else %} +

{% t tags.notags %}

+ {% endif %}
diff --git a/blog/index.html b/blog/index.html index 0db29138..f9a41d75 100644 --- a/blog/index.html +++ b/blog/index.html @@ -1,36 +1,66 @@ --- -layout: base -title: titles.allposts +layout: custom +title: titles.blogbytag --- -

{% t page.title %}

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

{{ post.title }}

-

- {{ post.summary }} -

-

- - {% t blog.author %} {{ post.author }} | {{ post.date | date: "%-d %B %Y" }}
- Category: - {% for tag in post.tags %} - {{ tag }}{% unless forloop.last %},{% endunless %} - {% endfor %} - -

-
- {% endfor %} -
-
- +
+ +
+
+
{% t blog.allposts %}
+
{% t blog.urgent %}
+
{% t blog.releases %}
+
{% t blog.community %}
+
{% t blog.meetinglogs %}
+
+
+ + +
+ +
+
+
+
+
+ +
+

{% t blog.allposts %}

+ {% for post in paginator.posts %} +
+

{{ post.title }}

+

+ {{ post.summary }} +

+

+ + {% t blog.author %} {{ post.author }} | {{ post.date | date: "%-d %B %Y" }}
+ Category: + {% for tag in post.tags %} + {{ tag }}{% unless forloop.last %},{% endunless %} + {% endfor %} + +

+
+ {% endfor %} +
+ +
+
{% if paginator.total_pages > 1 %}

diff --git a/css/custom.css b/css/custom.css index 2fcb0f59..dbdea601 100644 --- a/css/custom.css +++ b/css/custom.css @@ -1928,6 +1928,7 @@ img.monero-logo { .white-nav { margin-bottom: 1rem; line-height: 1; + text-align: center; } .white-nav>.nav-items>.nav-item { @@ -3881,6 +3882,42 @@ h3#months { /***********************************POST STYLING********************************/ +.blog .blog-nav a { + display: -ms-flexbox; + display: -webkit-box; + display: flex; + justify-content: center; + padding: 1rem 2rem; + font-weight: bold; + font-size: 0.92rem; + font-family: 'Hind', sans-serif; + -webkit-transition: all ease-out .2s; + -moz-transition: all ease-out .2s; + -o-transition: all ease-out .2s; + transition: all ease-out .2s; + border: none; +} + +.blog-nav a:hover { + background-color: #d26e2b; + color: #fff; + text-decoration: none; +} + +.blog .full>.info-block.blog-nav { + padding: 0; +} + +.blog .col { + width: 20%; +} + +.checked a { + background-color: #d26e2b; + color: #fff; + text-decoration: none; +} + .post-tag { padding-top: 1.5rem; }