do a full reorg to handle blog posts better

.eleventy.js

@@ -1,8 +1,8 @@
 module.exports = function (eleventyConfig) {
-  eleventyConfig.addPassthroughCopy("./src/css");
+  eleventyConfig.addPassthroughCopy("./src/_assets/css");
-  eleventyConfig.addPassthroughCopy("./src/img");
+  eleventyConfig.addPassthroughCopy("./src/_assets/img");
-  eleventyConfig.addPassthroughCopy("./src/fonts");
+  eleventyConfig.addPassthroughCopy("./src/_assets/fonts");
-  eleventyConfig.addPassthroughCopy("./src/js");
+  eleventyConfig.addPassthroughCopy("./src/_assets/js");
 
   return {
     passthroughFileCopy: true,

src/_assets/css/base/_bootstrap_overrides.scss

@@ -1,3 +0,0 @@
-// Override bootstraps variables here
-// Reference node_modules/bootstrap/scss/_variables.scss for a full list of variables
-// https://getbootstrap.com/docs/4.3/getting-started/theming/#variable-defaults

src/_assets/css/styles.css

@@ -4,6 +4,10 @@
 // Bootstrap
 // @import './vendor/bootstrap'; */
 
+/* @import './reset.css'; */
+
+/* / */
+
 /* Global variables. */
 :root {
   /* Set sans-serif & mono fonts */
@@ -12,55 +16,159 @@
     "Helvetica Neue", sans-serif;
   --mono-font: Consolas, Menlo, Monaco, "Andale Mono", "Ubuntu Mono", monospace;
   
-  /* Default (light) theme */
+  --bg: #6a826a;
-  --bg: #fff;
+  --container: #fffbef;
-  --accent-bg: #f5f7ff;
+  --accent-bg: #b99b6c;
-  --text: #82945b;
+  --text: #6a826a;
-  --text-light: #585858;
+  --header-text: #b99b6c;
-  --border: #d8dae1;
+  /* --text-light: #585858; */
-  --accent: #0d47a1;
+  --border: #6a826a;
+  --accent: #aa5757;
 }
 
-/* Dark theme */
-/*// @media (prefers-color-scheme: dark) {
-//   :root {
-//     --bg: #212121;
-//     --accent-bg: #2b2b2b;
-//     --text: #dcdcdc;
-//     --text-light: #ababab;
-//     --border: #666;
-//     --accent: #ffb300;
-//   }
-// }
-
-// * {
-//   box-sizing: border-box;
-// } */
-
 html {
   /* Set the font globally */
   font-family: var(--sans-font);
   scroll-behavior: smooth;
 }
 
-/* Make the body a nice central block */
+
+/* Format headers */
+
+h1 {
+  font-size: 2.5rem;
+  color: var(--header-text);
+}
+
+h2 {
+  font-size: 2rem;
+  margin-top: 3rem;
+  color: var(--header-text);
+}
+
+h3 {
+  color: var(--header-text);
+}
+
+/* Format links */
+a,
+a:visited {
+  color: var(--accent);
+}
+
+a:hover {
+  text-decoration: none;
+}
+
+hr {
+  border: 1px solid var(--border);
+}
+
 body {
   color: var(--text);
   background: var(--bg);
-  font-size: 1.15rem;
+  /* background-image: url("/img/l_ash02_big.jpg"); */
-  line-height: 1.5;
+  background-size: cover;
-  padding: 0 1em;
+  background-attachment: fixed;
+  line-height: 1.3;
   display: flex;
   justify-content: center;
-  flex-wrap: wrap-reverse;
+  flex-wrap: wrap;
+  gap: 20px;
+  margin: 20px;
+  height: 100%;
+  /* padding: 0 1em; */
+  /* font-size: 1.15rem; */
+  /* align-items: flex-start; */
 }
 
 main {
   /* // margin: 0 auto; */
-  max-width: 40em;
+  background: var(--container);
-  min-width: 40em;
+  width: 750px;
+  padding: 15px;
+  height: min-content;
+  /* border: 2px solid var(--border); */
+  border-radius: 15px;
+  box-sizing: border-box;
 }
 
+
+aside {
+  position: sticky;
+  height: min-content;
+  top: 20px;
+  width: 200px;
+  margin-top: 30px;
+  display:flex;
+  flex-direction: column;
+  align-items: center;
+  /* border: 2px solid var(--border); */
+}
+
+.profile-img {
+  width: 100px;
+  border-radius: 50px;
+  /* top: -70px; */
+  z-index: 1;
+  position: relative;
+}
+
+.sidebar-contents {
+  padding: 65px 15px 15px 15px;
+  border-radius: 15px;
+  background: var(--container);
+  box-sizing: border-box;
+  height: min-content;
+  width: 100%;
+  top: -50px;
+  position: relative;
+}
+
+@media all and (max-width: 1100px) {
+  body {
+    flex-direction: column-reverse;
+    max-width: 100%;
+    /* this is a pretty bad solution */
+    margin: -20px 20px 20px;
+  }
+
+  main {
+    max-width: 100%;
+  }
+
+  aside {
+    position: relative;
+  }
+
+  /* nav {
+    display: flex;
+    flex-direction: row;
+    gap: 1rem;
+  } */
+
+  .sidebar-contents {
+    /* padding: 15px; */
+    margin: 0 0 -25px 0;
+    /* width: min-content; */
+  }
+
+}
+
+article>p {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+/* body > footer {
+  margin-top: 4rem;
+  padding: 2rem 1rem 1.5rem 1rem;
+  color: var(--text-light);
+  font-size: 0.9rem;
+  text-align: center;
+  border-top: 1px solid var(--border);
+} */
+
 /* // body > header {
 //   text-align: center;
 //   padding: 0 0.5rem 2rem 0.5rem;
@@ -115,30 +223,6 @@ main {
 //   padding-top: 1.5rem;
 // } */
 
-body > footer {
-  margin-top: 4rem;
-  padding: 2rem 1rem 1.5rem 1rem;
-  color: var(--text-light);
-  font-size: 0.9rem;
-  text-align: center;
-  border-top: 1px solid var(--border);
-}
-
-/* Format headers */
-
-h1 {
-  font-size: 3rem;
-}
-
-h2 {
-  font-size: 2.6rem;
-  margin-top: 3rem;
-}
-
-aside {
-  position: sticky;
-}
-
 /* Reduce header size on mobile */
 /* // @media only screen and (max-width: 720px) {
 //   h1 {
@@ -149,13 +233,3 @@ aside {
 //     font-size: 2.1rem;
 //   }
 // } */
-
-/* Format links */
-a,
-a:visited {
-  color: var(--accent);
-}
-
-a:hover {
-  text-decoration: none;
-}

src/_assets/css/vendor/_bootstrap.scss

@@ -1 +0,0 @@
-@import "./../../../../node_modules/bootstrap/scss/bootstrap.scss";

src/_includes/layout/base.njk

@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="icon" type="image/x-icon" href="/img/fav.png">
-    <link rel="stylesheet" href="/css/normalize.css" />
+    <link rel="stylesheet" href="/_assets/css/normalize.css" />
-    <link rel="stylesheet" href="/css/styles.css" />
+    <link rel="stylesheet" href="/_assets/css/styles.css" />
     {% if title %}
       <title>{{ site.title }} - {{ title }}</title>
     {% else %}

src/_includes/partials/navigation.njk

@@ -1,8 +1,9 @@
 <nav>
   <a href="/">/</a><br/>
-  <a href="/blog/">/blog</a><br/>
+  <a href="/pages/">/pages</a><br/>
   <a href="/about/">/about</a><br/>
   <a href="/links/">/links</a><br/>
-  <a href="/contact/">/contact</a>
+  <a href="/contact/">/contact</a><br/>
+  <a href="/blog/">/blog</a><br/>
 </nav>
 {#INFO: It's important to stucture your links with the slashes / on either side of the href /about/ to ensure the links are always from the root of the site.#}

src/blog/my-first-post.html

@@ -1,5 +0,0 @@
----
-title: My First Blog Post
----
-
-<p>This is my first blog post</p>

src/blog/my-second-post.html

@@ -1,5 +0,0 @@
----
-title: My Second Blog Post
----
-
-<p>This is my second blog post</p>

src/blog/my-third-post.html

@@ -1,5 +0,0 @@
----
-title: My Third Blog Post
----
-
-<p>This is my third and final blog post</p>

src/blog/three-albums-march-2023.md

@@ -1,3 +0,0 @@
----
-title: three albums - january 2023
----

src/css/styles.css

@@ -1,235 +0,0 @@
-/* // Bootstrap overrides
-// @import './base/bootstrap_overrides';
-
-// Bootstrap
-// @import './vendor/bootstrap'; */
-
-/* @import './reset.css'; */
-
-/* / */
-
-/* Global variables. */
-:root {
-  /* Set sans-serif & mono fonts */
-  --sans-font: -apple-system, BlinkMacSystemFont, "Avenir Next", Avenir,
-    "Nimbus Sans L", Roboto, Noto, "Segoe UI", Arial, Helvetica,
-    "Helvetica Neue", sans-serif;
-  --mono-font: Consolas, Menlo, Monaco, "Andale Mono", "Ubuntu Mono", monospace;
-  
-  --bg: #6a826a;
-  --container: #fffbef;
-  --accent-bg: #b99b6c;
-  --text: #6a826a;
-  --header-text: #b99b6c;
-  /* --text-light: #585858; */
-  --border: #6a826a;
-  --accent: #aa5757;
-}
-
-html {
-  /* Set the font globally */
-  font-family: var(--sans-font);
-  scroll-behavior: smooth;
-}
-
-
-/* Format headers */
-
-h1 {
-  font-size: 2.5rem;
-  color: var(--header-text);
-}
-
-h2 {
-  font-size: 2rem;
-  margin-top: 3rem;
-  color: var(--header-text);
-}
-
-h3 {
-  color: var(--header-text);
-}
-
-/* Format links */
-a,
-a:visited {
-  color: var(--accent);
-}
-
-a:hover {
-  text-decoration: none;
-}
-
-hr {
-  border: 1px solid var(--border);
-}
-
-body {
-  color: var(--text);
-  background: var(--bg);
-  /* background-image: url("/img/l_ash02_big.jpg"); */
-  background-size: cover;
-  background-attachment: fixed;
-  line-height: 1.3;
-  display: flex;
-  justify-content: center;
-  flex-wrap: wrap;
-  gap: 20px;
-  margin: 20px;
-  height: 100%;
-  /* padding: 0 1em; */
-  /* font-size: 1.15rem; */
-  /* align-items: flex-start; */
-}
-
-main {
-  /* // margin: 0 auto; */
-  background: var(--container);
-  width: 750px;
-  padding: 15px;
-  height: min-content;
-  /* border: 2px solid var(--border); */
-  border-radius: 15px;
-  box-sizing: border-box;
-}
-
-
-aside {
-  position: sticky;
-  height: min-content;
-  top: 20px;
-  width: 200px;
-  margin-top: 30px;
-  display:flex;
-  flex-direction: column;
-  align-items: center;
-  /* border: 2px solid var(--border); */
-}
-
-.profile-img {
-  width: 100px;
-  border-radius: 50px;
-  /* top: -70px; */
-  z-index: 1;
-  position: relative;
-}
-
-.sidebar-contents {
-  padding: 65px 15px 15px 15px;
-  border-radius: 15px;
-  background: var(--container);
-  box-sizing: border-box;
-  height: min-content;
-  width: 100%;
-  top: -50px;
-  position: relative;
-}
-
-@media all and (max-width: 1100px) {
-  body {
-    flex-direction: column-reverse;
-    max-width: 100%;
-    /* this is a pretty bad solution */
-    margin: -20px 20px 20px;
-  }
-
-  main {
-    max-width: 100%;
-  }
-
-  aside {
-    position: relative;
-  }
-
-  /* nav {
-    display: flex;
-    flex-direction: row;
-    gap: 1rem;
-  } */
-
-  .sidebar-contents {
-    /* padding: 15px; */
-    margin: 0 0 -25px 0;
-    /* width: min-content; */
-  }
-
-}
-
-article>p {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-/* body > footer {
-  margin-top: 4rem;
-  padding: 2rem 1rem 1.5rem 1rem;
-  color: var(--text-light);
-  font-size: 0.9rem;
-  text-align: center;
-  border-top: 1px solid var(--border);
-} */
-
-/* // body > header {
-//   text-align: center;
-//   padding: 0 0.5rem 2rem 0.5rem;
-//   box-sizing: border-box;
-// }
-
-// body > header h1 {
-//   max-width: 100%;
-//   margin: 1rem auto;
-// } */
-
-/* Format navigation */
-/* // nav {
-//   border-bottom: 1px solid var(--border);
-//   font-size: 1rem;
-//   line-height: 2;
-//   padding: 1rem 0;
-//   display: flex;
-//   justify-content: center;
-//   align-items: center;
-//   width: 100%;
-//   padding-bottom: 2rem;
-// }
-
-// nav a {
-//   margin: 1rem 1rem 0 0;
-//   color: var(--text) !important;
-//   padding: 0.1rem 1rem;
-// }
-
-// nav a:hover {
-//   color: var(--accent) !important;
-// }
-
-// nav a:last-child {
-//   margin-right: 0;
-// } */
-
-/* Reduce nav side on mobile */
-/* // @media only screen and (max-width: 750px) {
-//   nav a {
-//     border: none;
-//     padding: 0;
-//     color: var(--accent);
-//     text-decoration: underline;
-//     line-height: 1;
-//   }
-// } */
-
-/* Add a little padding to ensure spacing is correct between content and nav */
-/* // main {
-//   padding-top: 1.5rem;
-// } */
-
-/* Reduce header size on mobile */
-/* // @media only screen and (max-width: 720px) {
-//   h1 {
-//     font-size: 2.5rem;
-//   }
-
-//   h2 {
-//     font-size: 2.1rem;
-//   }
-// } */

src/music/music.json

@@ -0,0 +1,4 @@
+{
+  "layout": "layout/blog",
+  "tags": "music"
+}