From 01dab4188c7840ff03d65d0b1597156d591c38be Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Tue, 3 Oct 2017 16:10:03 +0200 Subject: [PATCH] Style tweaks to blog archive --- src/styles/blog.sass | 22 ++++++++++-- src/templates/nodes/custom/blog/_macros.pug | 35 +++++++++++++------ .../custom/blog/archive_main_project.pug | 5 +-- 3 files changed, 46 insertions(+), 16 deletions(-) diff --git a/src/styles/blog.sass b/src/styles/blog.sass index 08768e18..d2109d77 100644 --- a/src/styles/blog.sass +++ b/src/styles/blog.sass @@ -614,11 +614,27 @@ padding-left: 70px h4.blog_index-title + color: $color-text-dark-secondary margin-left: 80px padding-top: 25px - font: - family: $font-body - color: $color-text-dark-secondary + + &.blog-archive + display: flex + font-size: 1em + margin-left: 0 + padding: 0 + text-align: center + + a + flex: 1 + padding: 15px + + &.disabled + color: $color-text-dark-hint + pointer-events: none + + h3.blog-archive-title + text-align: center #blog_index-container, diff --git a/src/templates/nodes/custom/blog/_macros.pug b/src/templates/nodes/custom/blog/_macros.pug index 163dca84..abf3ae23 100644 --- a/src/templates/nodes/custom/blog/_macros.pug +++ b/src/templates/nodes/custom/blog/_macros.pug @@ -70,9 +70,10 @@ h4.blog_index-title Blasts from the past | {% endfor %} | {% if more_posts_available %} -.blog_index-item - a.item-title.blog-archive(href="{{ project.blog_archive_url }}") - | {{posts_meta.total - posts|length}} more blog posts live here +h4.blog_index-title.blog-archive + a(href="{{ project.blog_archive_url }}") + | {{posts_meta.total - posts|length}} more blog posts over here + i.pi-angle-right | {% endif %} | {% else %} @@ -84,19 +85,31 @@ h4.blog_index-title Blasts from the past | {% endmacro %} //- ******************************************************* -// + +| {% macro render_archive_pagination(project) %} +h4.blog_index-title.blog-archive + a(class="{% if not project.blog_archive_prev %}disabled{% endif %}", + href="{{ project.blog_archive_prev }}", rel="prev") + i.pi-angle-left + | Previous page + + a(href="{{ url_for('main.project_blog', project_url=project.url) }}", rel="prev") + | Blog Index + + a(class="{% if not project.blog_archive_next %}disabled{% endif %}", + href="{{ project.blog_archive_next }}", rel="next") + | Next page + i.pi-angle-right +| {% endmacro %} + | {% macro render_archive(project, posts, posts_meta) %} -| {% if project.blog_archive_prev %} -.blog_index-item.list - a(href="{{ project.blog_archive_prev }}", rel="prev") Previous page -| {% endif %} + +| {{ render_archive_pagination(project) }} | {% for node in posts %} | {{ render_blog_list_item(node) }} | {% endfor %} -| {% if project.blog_archive_next %} -.blog_index-item.list - a(href="{{ project.blog_archive_next }}", rel="next") Next page -| {% endif %} +| {{ render_archive_pagination(project) }} | {% endmacro %} diff --git a/src/templates/nodes/custom/blog/archive_main_project.pug b/src/templates/nodes/custom/blog/archive_main_project.pug index 1b821198..ae818877 100644 --- a/src/templates/nodes/custom/blog/archive_main_project.pug +++ b/src/templates/nodes/custom/blog/archive_main_project.pug @@ -4,8 +4,9 @@ | {% block body %} .container.blog-archive #blog_container.cloud-blog - #blog_index-container.expand-image-links + #blog_index-container .blog_index-header - h1 Blog Archive + h3.blog-archive-title + | Blog Archive | {{ blogmacros.render_archive(project, posts, posts_meta) }} | {% endblock %}