aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--users/fcuny/notes/Makefile4
-rw-r--r--users/fcuny/notes/config.toml22
-rw-r--r--users/fcuny/notes/fly.toml7
-rw-r--r--users/fcuny/notes/layouts/_default/baseof.html1
-rw-r--r--users/fcuny/notes/layouts/_default/single.html14
-rw-r--r--users/fcuny/notes/layouts/index.atom.xml2
-rw-r--r--users/fcuny/notes/layouts/index.html17
-rw-r--r--users/fcuny/notes/layouts/partials/footer.html32
-rw-r--r--users/fcuny/notes/layouts/partials/header.html12
-rw-r--r--users/fcuny/notes/static/CNAME2
-rw-r--r--users/fcuny/notes/static/css/custom.css120
11 files changed, 117 insertions, 116 deletions
diff --git a/users/fcuny/notes/Makefile b/users/fcuny/notes/Makefile
index 5414dde..4644ac3 100644
--- a/users/fcuny/notes/Makefile
+++ b/users/fcuny/notes/Makefile
@@ -1,6 +1,6 @@
DOCKER := DOCKER_BUILDKIT=1 docker
DOCKER_BUILD_ARGS :=
-DOCKER_IMAGE := fcuny/fcuny.net
+DOCKER_IMAGE := fcuny/notes.fcuny.net
DOCKER_IMAGE_REF := $(shell git rev-parse HEAD)
DOCKERFILE := Dockerfile
PROJECT_DIR := $(realpath $(CURDIR))
@@ -18,7 +18,7 @@ worktree-clean:
deploy: worktree-clean docker-build
@echo "Deploying to fly ..."
flyctl deploy
- @git tag -a --message $$(flyctl info -j |jq -r '.App | "fcuny.net/v\(.Version)"') $$(flyctl info -j |jq -r '.App | "fcuny.net/v\(.Version)"')
+ @git tag -a --message $$(flyctl info -j |jq -r '.App | "notes.fcuny.net/v\(.Version)"') $$(flyctl info -j |jq -r '.App | "notes.fcuny.net/v\(.Version)"')
@git push origin --all
@git push origin --tags
diff --git a/users/fcuny/notes/config.toml b/users/fcuny/notes/config.toml
index 1fe49bc..6ee3e63 100644
--- a/users/fcuny/notes/config.toml
+++ b/users/fcuny/notes/config.toml
@@ -1,11 +1,12 @@
-baseURL = "https://fcuny.net/"
+baseURL = "https://notes.fcuny.net/"
languageCode = "en-us"
-title = "Franck's rambling"
+title = "Franck's notes"
publishDir = "docs"
enableGitInfo = true
[params]
homeText = "A collection of notes"
+ mainSections = ['notes']
[author]
name = "Franck Cuny"
@@ -15,29 +16,14 @@ enableGitInfo = true
tag = "tags"
[permalinks]
- blog = "/blog/:slug/"
notes = "/notes/:slug/"
tags = "/tags/:slug/"
[menu]
[[menu.main]]
- identifier = "articles"
- name = "blog"
- title = "articles"
- url = "/blog/"
- weight = 110
-
- [[menu.main]]
- identifier = "notes"
- name = "notes"
- title = "notes"
- url = "/notes/"
- weight = 120
-
- [[menu.main]]
identifier = "RSS"
name = "RSS"
- title = "RSS"
+ title = "~/notes/feed"
url = "/feed.xml"
weight = 130
diff --git a/users/fcuny/notes/fly.toml b/users/fcuny/notes/fly.toml
index 46468c1..4db1311 100644
--- a/users/fcuny/notes/fly.toml
+++ b/users/fcuny/notes/fly.toml
@@ -1,13 +1,10 @@
-# fly.toml file generated for fcunynet on 2021-06-20T10:01:50-07:00
+# fly.toml file generated for notes-fcunynet on 2022-03-28T19:44:54-07:00
-app = "fcunynet"
+app = "notes-fcunynet"
kill_signal = "SIGINT"
kill_timeout = 5
-[build]
- builtin = "hugo-static"
-
[env]
[experimental]
diff --git a/users/fcuny/notes/layouts/_default/baseof.html b/users/fcuny/notes/layouts/_default/baseof.html
index 0c72fb1..410e2bc 100644
--- a/users/fcuny/notes/layouts/_default/baseof.html
+++ b/users/fcuny/notes/layouts/_default/baseof.html
@@ -6,5 +6,6 @@
<main>
{{ block "main" . }}{{ end }}
</main>
+ {{- partial "footer.html" . -}}
</body>
</html>
diff --git a/users/fcuny/notes/layouts/_default/single.html b/users/fcuny/notes/layouts/_default/single.html
index 7a85a05..7f594ad 100644
--- a/users/fcuny/notes/layouts/_default/single.html
+++ b/users/fcuny/notes/layouts/_default/single.html
@@ -31,24 +31,10 @@
{{ end }}
</div>
-{{ if .Params.toc }}
-<div id="toc_small">
- <summary>Table of contents</summary>
- {{ .TableOfContents }}
-</div>
-{{ end }}
-
<article>
{{ .Content }}
</article>
</div>
-{{ if .Params.toc }}
-<div id="toc">
- <strong>Table of contents</strong>
- {{ .TableOfContents }}
-</div>
-{{ end }}
-
{{ end }}
diff --git a/users/fcuny/notes/layouts/index.atom.xml b/users/fcuny/notes/layouts/index.atom.xml
index 1d73f9b..e4b014b 100644
--- a/users/fcuny/notes/layouts/index.atom.xml
+++ b/users/fcuny/notes/layouts/index.atom.xml
@@ -8,7 +8,7 @@
<email>{{.}}</email>{{end}}
</author>{{end}}
<generator>Hugo -- gohugo.io</generator>
- {{ range where (first 10 (where .Site.Pages "Section" "blog")) "Params.hidden" "ne" "true" }}
+ {{ range where (first 10 (where .Site.Pages "Section" "notes")) "Params.hidden" "ne" "true" }}
<entry>
{{ `<title type="html"><![CDATA[` | safeHTML }}{{ .Title }}]]></title>
<link href="{{ .Permalink }}"/>
diff --git a/users/fcuny/notes/layouts/index.html b/users/fcuny/notes/layouts/index.html
index 2ab8c40..a340d3d 100644
--- a/users/fcuny/notes/layouts/index.html
+++ b/users/fcuny/notes/layouts/index.html
@@ -4,15 +4,16 @@
<h1>{{ .Site.Home.Title }}</h1>
-<p>I'm an engineer currently on a break. Previously I was a Site Reliability Engineer working on Twitter's compute platform.</p>
+<p>This is my collection of notes.</p>
-<h2>Contact</h2>
-<ul>
- <li>Email: <a href="mailto:franck@fcuny.net">franck@fcuny.net</a></li>
- <li>Git: <a href="https://git.fcuny.net/fcuny">@fcuny</a></li>
- <li>Twitter: <a href="https://twitter.com/franckcuny">@franckcuny</a></li>
- <li>Keys: <a href="/ssh.pub.sig">SSH public keys</a></li>
-</ul>
+ <h2>Notes</h2>
+ <ul>
+ {{- $pages := where site.RegularPages "Type" "in" site.Params.mainSections }}
+ {{ range $pages }}
+ {{- $fmt := "2006-01-02" }}
+ <li class="post-permalink"><span class="post-date" >{{ .Date.Format $fmt | safeHTML }}</span>, <a href="{{ .Permalink }}">{{ .Title }}</a></li>
+ {{ end }}
+ </ul>
</article>
diff --git a/users/fcuny/notes/layouts/partials/footer.html b/users/fcuny/notes/layouts/partials/footer.html
new file mode 100644
index 0000000..e2bf7ab
--- /dev/null
+++ b/users/fcuny/notes/layouts/partials/footer.html
@@ -0,0 +1,32 @@
+<footer>
+ <a href="mailto:franck@fcuny.net" title="franck@fcuny.net">
+ <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" class="bi bi-envelope-fill" viewBox="0 0 20 20">
+ <path d="M.05 3.555A2 2 0 0 1 2 2h12a2 2 0 0 1 1.95 1.555L8 8.414.05 3.555ZM0 4.697v7.104l5.803-3.558L0 4.697ZM6.761 8.83l-6.57 4.027A2 2 0 0 0 2 14h12a2 2 0 0 0 1.808-1.144l-6.57-4.027L8 9.586l-1.239-.757Zm3.436-.586L16 11.801V4.697l-5.803 3.546Z"/>
+ </svg>
+ </a>
+
+ <a target="_blank" href="https://git.fcuny.net/fcuny" title="git.fcuny.net">
+ <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" class="bi bi-git" viewBox="0 0 20 20">
+ <path d="M15.698 7.287 8.712.302a1.03 1.03 0 0 0-1.457 0l-1.45 1.45 1.84 1.84a1.223 1.223 0 0 1 1.55 1.56l1.773 1.774a1.224 1.224 0 0 1 1.267 2.025 1.226 1.226 0 0 1-2.002-1.334L8.58 5.963v4.353a1.226 1.226 0 1 1-1.008-.036V5.887a1.226 1.226 0 0 1-.666-1.608L5.093 2.465l-4.79 4.79a1.03 1.03 0 0 0 0 1.457l6.986 6.986a1.03 1.03 0 0 0 1.457 0l6.953-6.953a1.031 1.031 0 0 0 0-1.457"/>
+ </svg>
+ </a>
+
+ <a target="_blank" href="https://twitter.com/franckcuny" title="@franckcuny">
+ <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" class="bi bi-twitter" viewBox="0 0 20 20">
+ <path d="M5.026 15c6.038 0 9.341-5.003 9.341-9.334 0-.14 0-.282-.006-.422A6.685 6.685 0 0 0 16 3.542a6.658 6.658 0 0 1-1.889.518 3.301 3.301 0 0 0 1.447-1.817 6.533 6.533 0 0 1-2.087.793A3.286 3.286 0 0 0 7.875 6.03a9.325 9.325 0 0 1-6.767-3.429 3.289 3.289 0 0 0 1.018 4.382A3.323 3.323 0 0 1 .64 6.575v.045a3.288 3.288 0 0 0 2.632 3.218 3.203 3.203 0 0 1-.865.115 3.23 3.23 0 0 1-.614-.057 3.283 3.283 0 0 0 3.067 2.277A6.588 6.588 0 0 1 .78 13.58a6.32 6.32 0 0 1-.78-.045A9.344 9.344 0 0 0 5.026 15z"/>
+ </svg>
+ </a>
+
+ <a href="/ssh.pub.sig" title="SSH public keys">
+ <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" class="bi bi-filetype-key" viewBox="0 0 20 20">
+ <path fill-rule="evenodd" d="M14 4.5V14a2 2 0 0 1-2 2h-1v-1h1a1 1 0 0 0 1-1V4.5h-2A1.5 1.5 0 0 1 9.5 3V1H4a1 1 0 0 0-1 1v9H2V2a2 2 0 0 1 2-2h5.5L14 4.5ZM3.21 11.85h-.87L.83 13.64H.79v-1.79H0v3.999h.791v-1.283l.41-.466 1.12 1.749h.951l-1.488-2.276 1.427-1.723Zm2.903 3.352h-1.79v-1.073h1.685v-.606H4.323v-1.025h1.79v-.648H3.538v3.999h2.575v-.647Zm2.243-.888v1.535h-.794v-1.52L6.223 11.85H7.1l.853 1.696h.032l.855-1.696h.856l-1.339 2.464Z"/>
+ </svg>
+ </a>
+
+ <a href="/feed.xml" title="atom feed">
+ <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor" class="bi bi-rss-fill" viewBox="0 0 20 20">
+ <path d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm1.5 2.5c5.523 0 10 4.477 10 10a1 1 0 1 1-2 0 8 8 0 0 0-8-8 1 1 0 0 1 0-2zm0 4a6 6 0 0 1 6 6 1 1 0 1 1-2 0 4 4 0 0 0-4-4 1 1 0 0 1 0-2zm.5 7a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3z"/>
+ </svg>
+ </a>
+
+</footer>
diff --git a/users/fcuny/notes/layouts/partials/header.html b/users/fcuny/notes/layouts/partials/header.html
index dede0ae..fe90497 100644
--- a/users/fcuny/notes/layouts/partials/header.html
+++ b/users/fcuny/notes/layouts/partials/header.html
@@ -1,12 +1,10 @@
<header>
- <nav class="navbar">
- <a href="{{ .Site.BaseURL }}">
- fcuny.net
- </a>
+ <nav class="navbar">
+ <a class="nav-bold" href="{{ .Site.BaseURL }}">~/notes</a>
<ul class="nav-links">
- {{ range .Site.Menus.main }}
- <li class="nav-item"><a href="{{ absURL .URL }}">{{ .Title }}</a></li>
- {{ end }}
+ {{ range .Site.Menus.main }}
+ <li class="nav-item"><a class="nav-bold" href="{{ absURL .URL }}">{{ .Title }}</a></li>
+ {{ end }}
</ul>
</nav>
</header>
diff --git a/users/fcuny/notes/static/CNAME b/users/fcuny/notes/static/CNAME
index 7398ba2..5f43d63 100644
--- a/users/fcuny/notes/static/CNAME
+++ b/users/fcuny/notes/static/CNAME
@@ -1 +1 @@
-fcuny.net \ No newline at end of file
+notes.fcuny.net
diff --git a/users/fcuny/notes/static/css/custom.css b/users/fcuny/notes/static/css/custom.css
index ae6d674..70ce618 100644
--- a/users/fcuny/notes/static/css/custom.css
+++ b/users/fcuny/notes/static/css/custom.css
@@ -1,37 +1,40 @@
body {
font-family: sans-serif;
- font-size: 1.125em;
- line-height: 1.5;
- color: #37474f;
+ font-size: 1em;
+ line-height: 1.8em;
+ color: #0e0e0b;
margin: 1em auto;
padding: 0 0.55em;
- max-width: 45rem;
-}
-
-@media screen and (min-width:58rem) {
- body,
- main {
- max-width:calc(45rem + 15rem);
- }
- main {
- display: flex;
- }
+ max-width: 50rem;
}
h1 {
+ color: #0e0e0b;
font-size: 2rem;
margin-top: 1em;
margin-bottom: 0.34em;
}
-h2 {margin-top: 1.25em; margin-bottom: 0.41em}
-h3 {margin-top: 1.5em; margin-bottom: 0.5em}
+h2, h3 {
+ border-bottom: 1px solid #eee;
+ font-style: italic;
+}
+h2 {
+ margin-top: 1.25em;
+ margin-bottom: 0.41em;
+ font-size: 1.4rem;
+}
+h3 {
+ margin-top: 1.5em;
+ margin-bottom: 0.5em;
+ font-size: 1.2rem;
+}
hr{
color:#000111;
background-color:#000111;
border:none;
- height:2px
+ height:1px
}
a {
@@ -64,10 +67,12 @@ p code {
color: black;
background-color: #eee;
padding: 0 0.2rem;
+ font-size: 1.1em;
}
pre {
font-family: monospace;
+ font-size: 1.1em;
margin: 0;
word-wrap: normal;
padding: 0.8em;
@@ -130,20 +135,15 @@ blockquote {
}
nav {
- width: 100%;
padding-right: 10px;
+ font-size: 1.4em;
display: flex;
+ font-family: monospace;
justify-content: space-between;
align-items: center;
padding-top: 0.5rem;
}
-@media screen and (min-width:58rem) {
- nav {
- max-width: calc(45rem + 15rem);
- }
-}
-
.nav-links {
list-style: none;
display: flex;
@@ -151,51 +151,51 @@ nav {
.navbar a {
display: inline-block;
- padding-right: 10px;
+ text-decoration: none;
+}
+
+.navbar a:hover {
+ background-color: #b72d2d;
+ color: #fafafa;
+ text-decoration: none;
+}
+
+.nav-bold {
+ font-weight: 700;
+ color: #b72d2d;
+ text-decoration: none;
}
article {
- max-width: 45rem;
+ text-align: justify;
}
-#toc {display: none}
+.post-permalink {
+ list-style: none;
+ margin-left: -20px;
+}
-#toc_small {
- font-size: 0.9rem;
- margin-bottom: 2rem;
- margin-top: 2rem;
+.post-date {
+ font-family: monospace;
+ font-weight: 400;
+ font-size: 1.1em;
}
-@media screen and (min-width:58rem) {
- #toc_small {display: none;}
+
+footer {
+ border-top: 2px solid #eee;
+ margin-top: 2em;
+ display: flex;
+ flex-direction: row;
+ justify-content: left;
+ align-items: left;
}
-summary {
- display:flex;
- flex-direction:column;
+footer a, footer a:link, footer a:focus, footer a:active, footer a:hover {
+ color: black;
+ text-decoration: none;
+ padding: 5px;
}
-#TableOfContents > ul, #TableOfContents > ul > li > ul {
- list-style: none;
- margin: 0;
- padding: 0;
-}
-
-#TableOfContents li {margin-bottom: 1rem;}
-
-@media screen and (min-width:58rem) {
- #toc {
- padding-left: 1rem;
- padding-top: 4.5rem;
- font-size: 0.9rem;
- display:block;
- position:sticky;
- top:0;
- align-self:flex-start;
- max-width:15rem;
- z-index:1;
- }
- #TableOfContents {
- border-left: 3px solid #eee;
- padding-left: 1rem;
- }
+footer a:not(:first-child) {
+ margin-left: 15px;
}