From 4373e1f7baada56627d0946534afadae5ebda403 Mon Sep 17 00:00:00 2001 From: "Adam T. Carpenter" Date: Sat, 18 Jul 2020 15:53:12 -0400 Subject: updated blog page; how posts are rendered, made meta pull from frontmatter --- _includes/meta.liquid | 19 ++++++++++---- _includes/meta.liquid.bak | 10 ++++++++ _includes/nav.liquid | 6 +---- _includes/post-card.liquid | 39 +++++++++++++++++++++++++++++ _layouts/blog.liquid | 12 ++++++--- index.md | 1 + pages/blog.md | 10 ++------ posts/2020-06-05-a-new-tutoring-business.md | 3 ++- posts/2020-06-05-introduction-post.md | 7 +++++- styles/blog.scss | 7 ++++++ styles/main.scss | 6 ++++- 11 files changed, 95 insertions(+), 25 deletions(-) create mode 100644 _includes/meta.liquid.bak create mode 100644 _includes/post-card.liquid create mode 100644 styles/blog.scss diff --git a/_includes/meta.liquid b/_includes/meta.liquid index 7f0ee71..c969248 100644 --- a/_includes/meta.liquid +++ b/_includes/meta.liquid @@ -1,10 +1,19 @@ - - - + + + - + - + diff --git a/_includes/meta.liquid.bak b/_includes/meta.liquid.bak new file mode 100644 index 0000000..7f0ee71 --- /dev/null +++ b/_includes/meta.liquid.bak @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/_includes/nav.liquid b/_includes/nav.liquid index e26d6bd..43b5b11 100644 --- a/_includes/nav.liquid +++ b/_includes/nav.liquid @@ -2,11 +2,7 @@

+ Share on LinkedIn +

+ Share on Facebook +

diff --git a/_layouts/blog.liquid b/_layouts/blog.liquid index 3f94bd8..0734bb3 100644 --- a/_layouts/blog.liquid +++ b/_layouts/blog.liquid @@ -2,7 +2,7 @@ {{ page.title }} - + {% include "meta.liquid" %} @@ -13,11 +13,12 @@

- {% for post in collections.posts.pages %} + {% for post in collections.posts.pages %} {% if post.categories[0] + != "announcement" %}

- {{ post.title }} + {% include "post-card.liquid" %}

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

@@ -26,6 +27,9 @@

+ + {% include "footer.liquid" %} + diff --git a/index.md b/index.md index 3dde511..02ab84e 100644 --- a/index.md +++ b/index.md @@ -1,4 +1,5 @@ --- layout: index.liquid +description: Tutoring excellence in Hampton Roads. title: Welcome - Carpenter Tutoring --- diff --git a/pages/blog.md b/pages/blog.md index 9fa813c..2adef20 100644 --- a/pages/blog.md +++ b/pages/blog.md @@ -1,13 +1,7 @@ --- title: Blog layout: blog.liquid +description: Articles and Updates from Amy Carpenter permalink: "/{{slug}}" --- - -## Blog! - -{% for post in collections.posts.pages %} - -#### {{post.title}} - -[{{ post.title }}](/{{ post.permalink }}) {% endfor %} +(nothing actually goes here, check out ../posts) diff --git a/posts/2020-06-05-a-new-tutoring-business.md b/posts/2020-06-05-a-new-tutoring-business.md index 06da162..779886c 100644 --- a/posts/2020-06-05-a-new-tutoring-business.md +++ b/posts/2020-06-05-a-new-tutoring-business.md @@ -1,9 +1,10 @@ --- title: A New Tutoring Business categories: - - blog + - announcement published_date: "2020-06-05 01:46:56 +0000" layout: post.liquid is_draft: false --- + (Post text goes here) diff --git a/posts/2020-06-05-introduction-post.md b/posts/2020-06-05-introduction-post.md index cd563b6..70966a4 100644 --- a/posts/2020-06-05-introduction-post.md +++ b/posts/2020-06-05-introduction-post.md @@ -6,4 +6,9 @@ published_date: "2020-06-05 01:47:01 +0000" layout: post.liquid is_draft: false --- -(Post text goes here) +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor +incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis +nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. +Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu +fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in +culpa qui officia deserunt mollit anim id est laborum." diff --git a/styles/blog.scss b/styles/blog.scss new file mode 100644 index 0000000..d286a5e --- /dev/null +++ b/styles/blog.scss @@ -0,0 +1,7 @@ +@charset "utf-8"; + +//body { +// background-image: url("/assets/bg.png"); +//} +@import "./main.scss"; +@import "../_bulma/node_modules/bulma/sass/components/card.sass"; diff --git a/styles/main.scss b/styles/main.scss index 84ba8cf..1f12ce2 100644 --- a/styles/main.scss +++ b/styles/main.scss @@ -1,7 +1,7 @@ @charset "utf-8"; // Google Fonts -@import url("https://fonts.googleapis.com/css?family=Architects+Daughter|Indie+Flower|PT+Sans&display=swap"); +@import url("https://fonts.googleapis.com/css?family=Architects+Daughter|Indie+Flower|PT+Sans|PT+Sans+Narrow&display=swap"); // Palette $darkteal: rgb(0, 100, 108); @@ -36,6 +36,10 @@ $table-cell-heading-color: $darkteal; $table-head-cell-color: $darkteal; $dimensions: 16 24 32 48 64 96 128 200 256; +nav { + font-family: "PT Sans Narrow", sans-serif; +} + // Import only what you need from Bulma @import "../_bulma/node_modules/bulma/sass/utilities/functions.sass"; @import "../_bulma/node_modules/bulma/sass/utilities/initial-variables.sass"; -- cgit v1.2.3