From a3f8e661ad54cfec14ca671ea671e728ffc9bb91 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Sun, 7 Mar 2021 16:23:59 -0800 Subject: initial site with hugo Start my website from scratch once more, using hugo to generate it. For now the layout is pretty simple: - an index page that will list future notes - notes should be created under the "content" directory The theme is custom and I'll try to keep this simple. --- users/fcuny/notes/static/CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100644 users/fcuny/notes/static/CNAME (limited to 'users/fcuny/notes/static/CNAME') diff --git a/users/fcuny/notes/static/CNAME b/users/fcuny/notes/static/CNAME new file mode 100644 index 0000000..7398ba2 --- /dev/null +++ b/users/fcuny/notes/static/CNAME @@ -0,0 +1 @@ +fcuny.net \ No newline at end of file -- cgit 1.4.1 From 5483be5a93faac53c2319696e1d024fd049b8a09 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Mon, 28 Mar 2022 19:50:38 -0700 Subject: convert blog to notes Separating the two sites so I can customize them differently. --- users/fcuny/notes/Makefile | 4 +- users/fcuny/notes/config.toml | 22 +---- users/fcuny/notes/fly.toml | 7 +- users/fcuny/notes/layouts/_default/baseof.html | 1 + users/fcuny/notes/layouts/_default/single.html | 14 --- users/fcuny/notes/layouts/index.atom.xml | 2 +- users/fcuny/notes/layouts/index.html | 17 ++-- users/fcuny/notes/layouts/partials/footer.html | 32 +++++++ users/fcuny/notes/layouts/partials/header.html | 12 ++- users/fcuny/notes/static/CNAME | 2 +- users/fcuny/notes/static/css/custom.css | 120 ++++++++++++------------- 11 files changed, 117 insertions(+), 116 deletions(-) create mode 100644 users/fcuny/notes/layouts/partials/footer.html (limited to 'users/fcuny/notes/static/CNAME') 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 @@
{{ block "main" . }}{{ end }}
+ {{- partial "footer.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 }} -{{ if .Params.toc }} -
- Table of contents - {{ .TableOfContents }} -
-{{ end }} -
{{ .Content }}
-{{ if .Params.toc }} -
- Table of contents - {{ .TableOfContents }} -
-{{ 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 @@ {{.}}{{end}} {{end}} Hugo -- gohugo.io - {{ 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" }} {{ `<![CDATA[` | safeHTML }}{{ .Title }}]]> 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 @@

{{ .Site.Home.Title }}

-

I'm an engineer currently on a break. Previously I was a Site Reliability Engineer working on Twitter's compute platform.

+

This is my collection of notes.

-

Contact

- +

Notes

+
    + {{- $pages := where site.RegularPages "Type" "in" site.Params.mainSections }} + {{ range $pages }} + {{- $fmt := "2006-01-02" }} +
  • {{ .Date.Format $fmt | safeHTML }}, {{ .Title }}
    • + {{ end }} +
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 @@ + 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 @@
-
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; } -- cgit 1.4.1