diff options
| -rw-r--r-- | _includes/meta.liquid | 19 | ||||
| -rw-r--r-- | _includes/meta.liquid.bak | 10 | ||||
| -rw-r--r-- | _includes/nav.liquid | 6 | ||||
| -rw-r--r-- | _includes/post-card.liquid | 39 | ||||
| -rw-r--r-- | _layouts/blog.liquid | 12 | ||||
| -rw-r--r-- | index.md | 1 | ||||
| -rw-r--r-- | pages/blog.md | 10 | ||||
| -rw-r--r-- | posts/2020-06-05-a-new-tutoring-business.md | 3 | ||||
| -rw-r--r-- | posts/2020-06-05-introduction-post.md | 7 | ||||
| -rw-r--r-- | styles/blog.scss | 7 | ||||
| -rw-r--r-- | styles/main.scss | 6 |
11 files changed, 95 insertions, 25 deletions
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 @@ <meta charset="utf-8" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta name="viewport" content="width=device-width, initial-scale=1" /> -<meta property="og:description" content="Tutoring Excellence in Hampton Roads." /> -<meta property="og:image" content="http://carpentertutoring.com/assets/logo.webp" /> -<meta property="og:image:secure_url" content="https://carpentertutoring.com/assets/logo.webp" /> +<meta property="og:description" content="{{ page.description }}" /> +<meta + property="og:image" + content="http://carpentertutoring.com/assets/logo.webp" +/> +<meta + property="og:image:secure_url" + content="https://carpentertutoring.com/assets/logo.webp" +/> <meta property="og:site_name" content="Carpenter Tutoring" /> -<meta property="og:title" content="Carpenter Tutoring" /> +<meta property="og:title" content="{{ page.title }}" /> <meta property="og:type" content="website" /> -<meta property="og:url" content="https://carpentertutoring.com" /> +<meta + property="og:url" + content="https://carpentertutoring.com/{{ page.permalink }}" +/> 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 @@ +<meta charset="utf-8" /> +<meta http-equiv="X-UA-Compatible" content="IE=edge" /> +<meta name="viewport" content="width=device-width, initial-scale=1" /> +<meta property="og:description" content="Tutoring Excellence in Hampton Roads." /> +<meta property="og:image" content="http://carpentertutoring.com/assets/logo.webp" /> +<meta property="og:image:secure_url" content="https://carpentertutoring.com/assets/logo.webp" /> +<meta property="og:site_name" content="Carpenter Tutoring" /> +<meta property="og:title" content="Carpenter Tutoring" /> +<meta property="og:type" content="website" /> +<meta property="og:url" content="https://carpentertutoring.com" /> 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 @@ <nav class="navbar is-fixed-top"> <div class="navbar-brand"> <a class="navbar-item" href="/#"> - <picture> - <source srcset="/assets/logo-simple.webp" type="image/webp" /> - <source srcset="/assets/logo-simple.png" type="image/png" /> - <img src="/assets/logo-simple.png" /> - </picture> + <img src="/assets/logo-simple.png" /> </a> <a role="button" class="navbar-burger" data-target="navMenu"> <span></span> diff --git a/_includes/post-card.liquid b/_includes/post-card.liquid new file mode 100644 index 0000000..8e2a0a7 --- /dev/null +++ b/_includes/post-card.liquid @@ -0,0 +1,39 @@ +<div class="card"> + <div class="card-header"> + <div class="card-header-title"> + <h1 class="subtitle"> + {{ post.title }} + </h1> + </div> + </div> + {% if post.data.coverImage %} + <div class="card-image"> + <figure class="image is-4by3"> + <picture> + <source srcset="{{post.data.coverImage}}.webp" type="image/webp" /> + <source srcset="{{post.data.coverImage}}.png" type="image/png" /> + <img src="{{post.data.coverImage}}.png" /> + </picture> + </figure> + </div> + {% endif %} + <div class="card-content"> + <div class="content"> + {{ post.content | truncatewords: 20 }} + <a target="_blank" href="{{ post.permalink}}"> + <span class="icon"> + <i class="iconify" data-icon="open-in-new"></i> + </span> + Read more + </a> + </div> + </div> + <div class="card-footer"> + <div class="card-footer-item"> + Share on LinkedIn + </div> + <div class="card-footer-item"> + Share on Facebook + </div> + </div> +</div> 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 @@ <html lang="en"> <head> <title>{{ page.title }}</title> - <link rel="stylesheet" href="/styles/main.css" /> + <link rel="stylesheet" href="/styles/blog.css" /> {% include "meta.liquid" %} </head> <body class="has-navbar-fixed-top is-size-4-desktop"> @@ -13,11 +13,12 @@ <div class="columns"> <div class="column"> <div class="columns is-multiline is-centered"> - {% for post in collections.posts.pages %} + {% for post in collections.posts.pages %} {% if post.categories[0] + != "announcement" %} <div class="column"> - {{ post.title }} + {% include "post-card.liquid" %} </div> - {% endfor %} + {% endif %} {% endfor %} </div> </div> <div class="column is-narrow"> @@ -26,6 +27,9 @@ </div> </div> </section> + + {% include "footer.liquid" %} + <script src="/scripts/iconify.min.js" type="text/javascript"></script> </body> </html> @@ -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"; |