From 4d3d18cf0bddbec3d2879ab26b4bf0fe2794d069 Mon Sep 17 00:00:00 2001
From: yequari <yequari@32bit.cafe>
Date: Tue, 17 Oct 2023 15:54:16 -0700
Subject: [PATCH] merge about into index, add blog summary to index, add to
 /now

---
 config.yaml                          |  3 ---
 content/_index.md                    |  2 +-
 content/now.html                     |  8 --------
 content/now.md                       | 13 +++++++++++++
 layouts/partials/left-sidebar.html   |  6 ++++--
 themes/saturn/layouts/blog/list.html |  2 +-
 themes/saturn/layouts/index.html     | 11 +++++++----
 themes/saturn/static/css/main.css    |  8 +-------
 8 files changed, 27 insertions(+), 26 deletions(-)
 delete mode 100644 content/now.html
 create mode 100644 content/now.md

diff --git a/config.yaml b/config.yaml
index a3c1a4f..af4180e 100644
--- a/config.yaml
+++ b/config.yaml
@@ -15,9 +15,6 @@ menu:
     - name: PROJECTS
       pageRef: /projects
       weight: 30
-    - name: ABOUT
-      pageRef: /about
-      weight: 30
     - name: NOW
       pageRef: /now
       weight: 40
diff --git a/content/_index.md b/content/_index.md
index 73ecae1..abe5f7b 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -3,4 +3,4 @@ title: yequari.com
 ---
 # hello 
 
-I'm yequari, welcome to my homepage! I write about tech, the web, programming, games, and random thoughts I have. 
+I'm yequari, welcome to my homepage! I am a software developer, interested in the small web and systems programming. My hobbies include games of all kinds, coding, and collecting Transformers figures. On this site I write about the web, programming, games, and random thoughts I have. 
diff --git a/content/now.html b/content/now.html
deleted file mode 100644
index 64b9bac..0000000
--- a/content/now.html
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: "Now"
-date: 2023-04-17T15:00:46-07:00
----
-<div id="content">
-    <h1>Now</h1>
-    Coming soon
-</div>
diff --git a/content/now.md b/content/now.md
new file mode 100644
index 0000000..ef81f6a
--- /dev/null
+++ b/content/now.md
@@ -0,0 +1,13 @@
+---
+title: "Now"
+date: 2023-04-17T15:00:46-07:00
+---
+# Now
+
+One day this page will pull some info from APIs to create a more interesting page but for now I just manually update it as needed.
+
+**Games I'm playing**: Cyberpunk 2077, Honkai Star Rail, Baldur's Gate 3
+
+**Shows I'm watching**: Nothing currently
+
+**Music I'm listening to**: Kyuss, Tool, Cyberpunk 2077 Soundtrack, 100 gecs, King Crimson, breakcore
diff --git a/layouts/partials/left-sidebar.html b/layouts/partials/left-sidebar.html
index 7b3f16c..3275df2 100644
--- a/layouts/partials/left-sidebar.html
+++ b/layouts/partials/left-sidebar.html
@@ -1,4 +1,6 @@
-<p>Latest Blog Posts</p>
+<h2>Latest Blog Posts</h2>
 {{ range first 3 (where .Site.RegularPages.ByDate.Reverse "Section" "blog") }}
-<p><a href="{{ .RelPermalink }}">{{ .Name }}</a></p>
+<h3><a href="{{ .RelPermalink }}">{{ .Name }}</a></h3>
+<p>{{ .Summary }}</p>
+<a href="{{ .RelPermalink }}">Read More &gt;</a>
 {{ end }}
diff --git a/themes/saturn/layouts/blog/list.html b/themes/saturn/layouts/blog/list.html
index 8ebeca0..b1bb699 100644
--- a/themes/saturn/layouts/blog/list.html
+++ b/themes/saturn/layouts/blog/list.html
@@ -10,7 +10,7 @@
         </p>
         {{ if .Truncated }}
         <div>
-            <a href="{{ .RelPermalink }}">Read More...</a>
+            <a href="{{ .RelPermalink }}">Read More &gt;</a>
         </div>
         {{ end }}
     </article>
diff --git a/themes/saturn/layouts/index.html b/themes/saturn/layouts/index.html
index f679bd7..6a9d212 100644
--- a/themes/saturn/layouts/index.html
+++ b/themes/saturn/layouts/index.html
@@ -1,6 +1,9 @@
 {{ define "main" }}
-<div id="content">
-{{ .Content }}
-    {{ partial "left-sidebar.html" . }}
-</div>
+    {{ .Content }}
+    <h2>Latest Blog Posts</h2>
+    {{ range first 3 (where .Site.RegularPages.ByDate.Reverse "Section" "blog") }}
+        <h3>{{ .Name }}</h3>
+        <p>{{ .Summary }}</p>
+        <a href="{{ .RelPermalink }}">Read More &gt;</a>
+    {{ end }}
 {{ end }}
diff --git a/themes/saturn/static/css/main.css b/themes/saturn/static/css/main.css
index 32452a3..f2a6103 100644
--- a/themes/saturn/static/css/main.css
+++ b/themes/saturn/static/css/main.css
@@ -232,11 +232,9 @@ nav li a:hover, nav li a:active {
 }
 
 main {
-    flex: 1;
-    display: flex;
+    flex: 8 1;
     background-color: var(--content-bg);
     padding: 0 150px;
-    flex-flow: row wrap;
     z-index: 1;
 }
 
@@ -253,10 +251,6 @@ main li {
     line-height: 1;
 }
 
-.content {
-    flex: 8 1;
-    padding: 0 1rem;
-}
 
 article p {
     text-indent: 1rem;