diff --git a/assets/css/custom.css b/assets/css/custom.css index 01d332b..87bdd2f 100644 --- a/assets/css/custom.css +++ b/assets/css/custom.css @@ -6,6 +6,30 @@ remove this file → original shibui look returns. ══════════════════════════════════════════════════════════════ */ +/* self-hosted serif, used only for the project-info side panel */ +@font-face { + font-family: "Libre Baskerville"; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url("/fonts/libre-baskerville-400.woff2") format("woff2"); +} +@font-face { + font-family: "Libre Baskerville"; + font-style: italic; + font-weight: 400; + font-display: swap; + src: url("/fonts/libre-baskerville-400italic.woff2") format("woff2"); +} +@font-face { + font-family: "Libre Baskerville"; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url("/fonts/libre-baskerville-700.woff2") format("woff2"); +} +:root { --font-family-serif: "Libre Baskerville", Georgia, serif; } + /* ─────────────────────── SHELL PROMPT ─────────────────────── */ .prompt { font-family: var(--font-family-mono); @@ -143,6 +167,40 @@ body:not(.home) .menu { display: none; } .tui__text > :first-child { margin-top: 0; } .tui__text > :last-child { margin-bottom: 0; } +/* ─────────────────── PROJECT INFO PANEL ─────────────────── */ +/* info.md (the project description / about text) lives outside the + filebrowser now — on wide viewports it sits to the right of the whole + file list, clearing the "$ ls" / "total N" shell lines up top; on narrow + ones there's no room for two columns, so it just stacks below instead. */ +.proj-layout { display: block; } +.proj-info { + margin: 1.5rem 0 0; + font-family: var(--font-family-serif); + font-size: 1.05em; + line-height: 1.6; +} +.proj-info > :first-child { margin-top: 0; } +.proj-info > :last-child { margin-bottom: 0; } + +@media (min-width: 900px) { + .proj-layout { + width: 100vw; + margin-left: calc(50% - 50vw); + margin-right: calc(50% - 50vw); + padding: 0 1.5rem; + box-sizing: border-box; + display: flex; + justify-content: center; + align-items: flex-start; + gap: 2.5rem; + } + .proj-layout .filebrowser { flex: 0 1 var(--container-width); min-width: 0; } + .proj-info { + flex: 0 1 calc(var(--container-width) - 4rem); /* slightly narrower than the content column */ + margin-top: 3.6rem; /* clear the two shell lines above the file list */ + } +} + /* prev/next as shell "cd" commands — same vocabulary as the rest of the site */ .proj-nav { font-family: var(--font-family-mono); diff --git a/layouts/_default/about.html b/layouts/_default/about.html index 36ed524..765267d 100644 --- a/layouts/_default/about.html +++ b/layouts/_default/about.html @@ -1,27 +1,26 @@ {{ define "bodyclass" }}page-about{{ end }} {{ define "main" }} {{ $cv := .Site.GetPage "/cv" }} +
+{{ if $cv }}

$ ls

-

total {{ if $cv }}2{{ else }}1{{ end }}

+

total 1

-
{{ .Content }}
- {{ if $cv }}{{ end }} -
info.md
+
{{ $cv.Content }}
+
cv.md
{{ end }} + +
+{{ end }} diff --git a/layouts/portfolio/single.html b/layouts/portfolio/single.html index ff4b813..2ecb7a8 100644 --- a/layouts/portfolio/single.html +++ b/layouts/portfolio/single.html @@ -4,36 +4,32 @@ {{ $images := .Params.images }} {{ $video := .Params.video }} -{{ if or $images $hasText $video }} +{{ if or $images $video $hasText }} +
+{{ if or $images $video }}

$ ls

- {{ $total := 0 }}{{ if $images }}{{ $total = len $images }}{{ end }}{{ if $hasText }}{{ $total = add $total 1 }}{{ end }}{{ if $video }}{{ $total = add $total 1 }}{{ end }} + {{ $total := 0 }}{{ if $images }}{{ $total = len $images }}{{ end }}{{ if $video }}{{ $total = add $total 1 }}{{ end }}

total {{ $total }}

- {{ if $hasText }}
{{ .Content }}
{{ end }} {{ if $video }} -
+
@@ -47,11 +43,14 @@
{{ end }} - {{ if $images }}{{ end }} -
{{ if $hasText }}info.md{{ else if $video }}video.mp4{{ else if $images }}{{ (index $images 0).name }}{{ end }}
+ {{ if $images }}{{ end }} +
{{ if $video }}video.mp4{{ else if $images }}{{ (index $images 0).name }}{{ end }}
{{ end }} +{{ if $hasText }}{{ end }} +
+{{ end }} {{ with .Params.studies }} {{ $segs := after 2 (split . "/") }} diff --git a/static/fonts/libre-baskerville-400.woff2 b/static/fonts/libre-baskerville-400.woff2 new file mode 100644 index 0000000..5a00837 Binary files /dev/null and b/static/fonts/libre-baskerville-400.woff2 differ diff --git a/static/fonts/libre-baskerville-400italic.woff2 b/static/fonts/libre-baskerville-400italic.woff2 new file mode 100644 index 0000000..14a869f Binary files /dev/null and b/static/fonts/libre-baskerville-400italic.woff2 differ diff --git a/static/fonts/libre-baskerville-700.woff2 b/static/fonts/libre-baskerville-700.woff2 new file mode 100644 index 0000000..608064e Binary files /dev/null and b/static/fonts/libre-baskerville-700.woff2 differ