From 88c0ef0e7c6dc7e1641b444a9206f0980a390407 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Sat, 15 Sep 2018 21:32:54 +0200 Subject: [PATCH] Blog: fixes and tweaks --- src/styles/blog.sass | 2 ++ src/styles/components/_jumbotron.sass | 4 +++- src/templates/nodes/custom/blog/archive.pug | 6 +++--- src/templates/nodes/custom/blog/index.pug | 4 ---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/styles/blog.sass b/src/styles/blog.sass index 5cea6656..24babb31 100644 --- a/src/styles/blog.sass +++ b/src/styles/blog.sass @@ -22,6 +22,7 @@ @import "../../node_modules/bootstrap/scss/nav" @import "../../node_modules/bootstrap/scss/navbar" +@import "../../node_modules/bootstrap/scss/card" @import "../../node_modules/bootstrap/scss/jumbotron" @import "../../node_modules/bootstrap/scss/media" @import "../../node_modules/bootstrap/scss/close" @@ -34,6 +35,7 @@ @import "apps_base" @import "components/base" +@import "components/card" @import "components/jumbotron" @import "components/navbar" @import "components/dropdown" diff --git a/src/styles/components/_jumbotron.sass b/src/styles/components/_jumbotron.sass index 90be99f8..5b364e1c 100644 --- a/src/styles/components/_jumbotron.sass +++ b/src/styles/components/_jumbotron.sass @@ -1,7 +1,9 @@ // Mainly overrides bootstrap jumbotron settings .jumbotron + @extend .d-flex + @extend .mb-0 + @extend .rounded-0 background-size: cover - border-radius: 0 margin-bottom: 0 padding-top: 10em padding-bottom: 10em diff --git a/src/templates/nodes/custom/blog/archive.pug b/src/templates/nodes/custom/blog/archive.pug index 18b34f79..fde0325a 100644 --- a/src/templates/nodes/custom/blog/archive.pug +++ b/src/templates/nodes/custom/blog/archive.pug @@ -3,9 +3,9 @@ | {% block body %} .container - .pt-4 - h2.text-uppercase.font-weight-bold - | Blog Archive + .pt-5.pb-2 + h2.text-uppercase.font-weight-bold.text-center + | {{ project.name }} Blog Archive | {{ blogmacros.render_archive(project, posts, posts_meta) }} | {% endblock body %} diff --git a/src/templates/nodes/custom/blog/index.pug b/src/templates/nodes/custom/blog/index.pug index c38a7617..8805b268 100644 --- a/src/templates/nodes/custom/blog/index.pug +++ b/src/templates/nodes/custom/blog/index.pug @@ -11,11 +11,7 @@ | {% endblock navigation_tabs %} | {% block body %} -| {% if node %} -| {{ blogmacros.render_blog_post(node, project=project) }} -| {% else %} | {{ blogmacros.render_blog_index(project, posts, can_create_blog_posts, api, more_posts_available, posts_meta, pages=pages) }} -| {% endif %} | {% endblock %} | {% block footer_scripts %}