work on layout and write basic nginx pageHEADmaster

7 files changed, 71 insertions, 26 deletions

diff --git a/themes/orca/assets/style.css b/themes/orca/assets/style.css
index 49c53ad..a4dcc49 100644
--- a/themes/orca/assets/style.css
+++ b/themes/orca/assets/style.css
@@ -1,45 +1,52 @@
+:root {
+  --header-color: purple;
+  --highlight-color: violet;
+  --background-color: #090909;
+  --foreground-color: white;
+  --ruler-color: lightgray;
+  --item-color: #191919;
+}
+
 body {
   margin: 0;
-  background-color: #090909;
-  color: white;
+  background-color: var(--background-color);
+  color: var(--foreground-color);
 }
 
 a {
-  color: violet;
+  color: var(--highlight-color);
 }
 
 header nav {
-  background: purple;
+  background: var(--header-color);
   padding: 4px;
-  color: violet;
+  color: var(--highlight-color);
 }
 
 header nav a {
   text-decoration: none;
-  color: white;
+  color: var(--foreground-color);
 }
 
 header nav a:hover {
   text-decoration: underline;
 }
 
-header nav *.right {
-  float: right;
-}
-
+header .title,
+header nav div,
 main {
-  margin: 0 0.8em;
-  max-width: 50em;
+  margin: auto;
+  max-width: 70em;
 }
 
 main h1,
 main h2,
 main h3 {
-  border-bottom: 1px lightgray dotted;
+  border-bottom: 1px var(--ruler-color) dotted;
 }
 
 .post {
-  background: #191919;
+  background: var(--item-color);
   padding: 0.5em;
 }
 
@@ -49,11 +56,11 @@ main h3 {
 
 hr {
   border: none;
-  border-bottom: 1px lightgray dotted;
+  border-bottom: 1px var(--ruler-color) dotted;
 }
 
 header .title {
-  margin: 0.5em;
+  margin: 0.5em auto;
 }
 
 header .title img {
@@ -76,3 +83,19 @@ header .title h2 a {
 header .title h2 a:hover {
   text-decoration: underline;
 }
+
+pre {
+  padding: 4px;
+}
+
+.res {
+  background-color: var(--item-color);
+  min-width: 200px;
+  float: right;
+}
+
+.res div {
+  text-align: center;
+  background-color: var(--header-color);
+  padding: 4px;
+}
diff --git a/themes/orca/layouts/_default/baseof.html b/themes/orca/layouts/_default/baseof.html
index 034b6a1..227f431 100644
--- a/themes/orca/layouts/_default/baseof.html
+++ b/themes/orca/layouts/_default/baseof.html
@@ -14,6 +14,7 @@
 {{ block "main" . }}
   {{ .Content }}
 {{ end }}
+  {{ partial "footer.html" . }}
   </main>
 </body>
 </html>
diff --git a/themes/orca/layouts/_default/single.html b/themes/orca/layouts/_default/single.html
index a59ecb7..66ded2e 100644
--- a/themes/orca/layouts/_default/single.html
+++ b/themes/orca/layouts/_default/single.html
@@ -1,6 +1,20 @@
 {{ define "main" }}
 <h1>{{ .Title }}</h1>
-  {{ .Content }}
+{{ with .Params.res }}
+<div class="res">
+  <div>Resources</div>
+  <ul>
+  {{ range . }}
+    {{ range $k, $v := . }}
+    <li><a href="{{ $v }}">{{ $k }}</a></li>
+    {{ end }}
+  {{ end }}
+  </ul>
+</div>
+{{ end }}
+{{ .Summary }}
+{{ .TableOfContents }}
+{{ (replace .Content .Summary "") | safeHTML }}
   {{ with .Lastmod }}
 <p>Last modified {{ .Format "January 2nd, 2006" }}.</p>
   {{ end }}
diff --git a/themes/orca/layouts/_default/blog.html b/themes/orca/layouts/_default/whatnot.html
index 0f73423..0f73423 100644
--- a/themes/orca/layouts/_default/blog.html
+++ b/themes/orca/layouts/_default/whatnot.html
diff --git a/themes/orca/layouts/partials/footer.html b/themes/orca/layouts/partials/footer.html
new file mode 100644
index 0000000..a2ad329
--- /dev/null
+++ b/themes/orca/layouts/partials/footer.html
@@ -0,0 +1,6 @@
+<hr>
+<p>All content is written by <a href="/">frosty</a> unless noted otherwise. If you think something is incorrect, let me know.</p>
+<a href="https://www.gentoo.org/"><img src="/gentoo.png" alt="Gentoo Linux"/></a>
+<a href="https://www.vim.org/"><img src="/vim.png" alt="Vim: the editor"/></a>
+<br>
+<br>
diff --git a/themes/orca/layouts/partials/header.html b/themes/orca/layouts/partials/header.html
index 77d2a39..666539a 100644
--- a/themes/orca/layouts/partials/header.html
+++ b/themes/orca/layouts/partials/header.html
@@ -1,14 +1,13 @@
 <header>
   <div class="title">
-    <img src="/icon.png"/>
     <h2><a href="/">{{ .Site.Title }}</a></h2>
   </div>
   <nav>
-{{ range site.Menus.main }}
+    <div>
+{{ range $i, $t := site.Menus.main -}}
+{{ if $i }} {{ end -}}
     <span>[<a href="{{ .URL }}">{{ .Name }}</a>]</span>
-{{ end }}
-{{ range site.Menus.right_main }}
-    <span class="right">[<a href="{{ .URL }}">{{ .Name }}</a>]</span>
-{{ end }}
+{{- end }}
+    </div>
   </nav>
 </header>
diff --git a/themes/orca/layouts/partials/post-item.html b/themes/orca/layouts/partials/post-item.html
index 183dd28..b20a8f8 100644
--- a/themes/orca/layouts/partials/post-item.html
+++ b/themes/orca/layouts/partials/post-item.html
@@ -1,11 +1,13 @@
 <div class="post">
   <small class="right"><a href="/{{ .Type }}/">{{ .Type }}</a></small>
-  <b><a href="{{ .Permalink }}">{{ .Title }}</a></b>
-  <br>
   <i>{{ .Date.Format "January 2nd, 2006" }}</i>
   <br>
+  <b><a href="{{ .Permalink }}">{{ .Title }}</a></b>
   <br>
   <span>
-  {{ range $i, $t := .Params.tags }}{{ if $i }}, {{ end }}<a href="">{{ $t }}</a>{{ end }}
+{{ range $i, $t := .Params.tags -}}
+  {{ if $i }}, {{ end -}}
+  {{ $t -}}
+{{- end }}
   </span>
 </div>