diff --git a/i18n/en.toml b/i18n/en.toml index 3761fbb..bf260c4 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -27,6 +27,9 @@ other = "Translations" # General +[and] +other = "And" + [back_to_home] other = "Back to home" diff --git a/i18n/tl.toml b/i18n/tl.toml index 4fd1840..9293def 100644 --- a/i18n/tl.toml +++ b/i18n/tl.toml @@ -27,6 +27,9 @@ other = "Mga pagsasalin" # General +[and] +other = "At" + [back_to_home] other = "Balik sa homepage" diff --git a/layouts/_default/list.atom b/layouts/_default/list.atom index 2de4e17..99225c7 100644 --- a/layouts/_default/list.atom +++ b/layouts/_default/list.atom @@ -1,29 +1,49 @@ +{{- /* This template was based from the Atom syndication format at IETF RFC #4287 (https://tools.ietf.org/html/rfc4287). */ -}} {{ printf "" | safeHTML }} - {{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}{{ with .Site.Params.Subtitle }} - {{ . | safeHTML }}{{ end }} - - - {{ with .Site.Copyright }}{{ . }}{{ else }}© {{ now.Year }} {{ $.Site.Author.name }}{{ end }} + {{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }} + + {{- range .AlternativeOutputFormats }} + {{- printf "" .Rel .MediaType .Permalink | safeHTML }} + {{- end }} + {{ with .Site.Copyright }}{{ . }}{{ else }}© {{ now.Year }} {{ with .Site.Author.name }}{{ . }}{{ end }}{{ end }} Hugo -- gohugo.io {{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML }} + + {{ with .Site.Author }} - {{ .Site.Author.name }}{{ with .Site.Author.email }} - {{ . }}{{ end }} + {{ .name }} + {{ with .email }}{{ . }}{{ end }} + {{ end }} {{ .Permalink }} + + {{- /* Generate each valid regular pages (with as an individual entry in the feed. */ -}} {{ $limit := cond (gt .Site.Params.feedLimit 0) .Site.Params.feedLimit 10 }} - {{ range first $limit (where .RegularPages "File.Dir" "!=" "/") }} + {{ range first $limit (where .Site.RegularPages ".Params.date" "!=" nil) }} {{ .Permalink }} {{ .Title }} - {{ with .Params.author }} - {{ . }}{{ end }}{{ range .Params.tags }} - {{ end }} + + + {{- range .Params.author }} + + {{ .name }}{{ with .email }} + {{ . }}{{ end }} + + {{- end }} + + {{- range .Params.tags }} + + {{- end }} {{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML }} - {{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}{{ with .Params.license }} - {{ . | safeHTML }}{{ end }} + {{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" | safeHTML }} + + {{ with .Params.copyright }} + {{ . | safeHTML }} + {{ end }} + {{ .Content | html }} {{ end }} - \ No newline at end of file + diff --git a/layouts/_default/list.html b/layouts/_default/list.html index c503765..b16953e 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -12,22 +12,22 @@ {{ .Date.Format "2006-01-02" }} {{ end }} + {{ end }} diff --git a/layouts/_default/list.json b/layouts/_default/list.json index c1921b8..298088b 100644 --- a/layouts/_default/list.json +++ b/layouts/_default/list.json @@ -6,15 +6,20 @@ "description": "Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}", "favicon": "{{ "assets/icon.png" | absURL }}", "icon": "{{ "assets/icon.png" | absURL }}", + {{- with .Site.Author }} "author": { - "name": "{{ with .Site.Author.name }}{{ . }}{{ end }}" + "name": "{{ .name }}" + {{- with .email }}, + "url": "mailto:{{ . }}" + {{ end }} }, + {{- end }} "items": {{- $limit := cond (gt .Site.Params.feedLimit 0) .Site.Params.feedLimit 10 -}} - {{- $pages := first $limit (where .RegularPages "File.Dir" "!=" "/") -}} + {{- $pages := first $limit (where .Site.RegularPages "Params.date" "!=" nil) -}} {{- $.Scratch.Add "index" slice -}} {{- range $pages -}} - {{- $.Scratch.Add "index" (dict "id" .Permalink "url" .Permalink "title" .Title "summary" .Summary "content_html" .Content "tags" .Params.tags "date_published" (.Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML) "date_modified" ( .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML ) ) -}} + {{- $.Scratch.Add "index" (dict "id" .Permalink "url" .Permalink "title" .Title "summary" .Summary "content_html" .Content "tags" .Params.tags "date_published" (.Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML) "date_modified" ( .Lastmod.Format "2006-01-02T15:04:05Z07:00" | safeHTML ) ) -}} {{- end -}} {{- $.Scratch.Get "index" | jsonify -}} -} \ No newline at end of file +} diff --git a/layouts/_default/list.rss b/layouts/_default/list.rss index a2e0440..dc4df8a 100644 --- a/layouts/_default/list.rss +++ b/layouts/_default/list.rss @@ -1,30 +1,61 @@ +{{- /* +The reference used to create this template is at https://cyber.harvard.edu/rss/rss.html. +The template does miss out on certain things which I put it on a list for those who are interested: + * Since there's no standard for multiple authors (with ) in the element, I decided it would be best to leave it out for now. + * The name was left out for certain elements that requires an email address (like , , or in the . + * is a permalink to the HTML post. + * No . + * contains the whole post; if you want to change it to and make a summarized version, refer to https://www.rssboard.org/rss-profile and change the description tag with `.Summary | safeHTML`. +*/ -}} {{ printf "" | safeHTML }} {{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }} {{ .Permalink }} Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }} - Hugo -- gohugo.io{{ with .Site.LanguageCode }} - {{.}}{{end}}{{ with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}} - {{ with .Site.Copyright }}{{ . }}{{ else }}© {{ now.Year }} {{ $.Site.Author.name }}{{ end }}{{ if not .Date.IsZero }} - {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}{{ end }} + Hugo -- gohugo.io + + {{ with .Site.LanguageCode }} + {{.}} + {{end}} + + {{ with .Site.Author.email }} + {{.}} + {{.}} + {{end}} + + {{ with .Site.Copyright }}{{ . }}{{ else }}© {{ now.Year }} to the author(s) behind {{ .Site.Title }}{{ end }} + + {{ if not .Date.IsZero }} + {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} + {{ end }} + https://cyber.harvard.edu/rss/rss.html + {{ with .OutputFormats.Get "RSS" }} {{ printf "" .Permalink .MediaType | safeHTML }} {{ end }} + + {{- /* Point the alternative output formats. */ -}} + {{ range .AlternativeOutputFormats }} + {{ printf "" .Permalink .Rel .MediaType | safeHTML }} + {{ end }} + + {{- /* Iterate each valid regular page. */ -}} {{ $limit := cond (gt .Site.Params.feedLimit 0) .Site.Params.feedLimit 10 }} - {{ range first $limit (where .RegularPages "File.Dir" "!=" "/") }} + {{ range first $limit (where .Site.RegularPages ".Params.date" "!=" nil) }} {{ .Title }} - {{ .Permalink }}{{ range .Params.tags }} - {{ . }}{{ end }} + {{ .Permalink }} + + {{ range .Params.tags }} + {{ . }} + {{ end }} + {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} - {{ with .Site.Author.email }}{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}} {{ .Permalink }} {{ .Content | html }} {{ end }} - \ No newline at end of file + diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 6112206..5ad5a56 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -6,11 +6,16 @@
{{- with .Params.author }} -

{{ i18n "published_by" }}: {{ range . }}{{ . }}; {{ end }}

+ {{- $names := slice }} + {{- range . }}{{ $names = $names | append .name }}{{ end }} +

{{ i18n "published_by" }}: {{ delimit $names ", " ", and " }}

{{- end }} + + {{- if ne (.Date.Format "2006") "0001" }}

{{ i18n "published_on" }}: {{ .Date.Format "2006-01-02" }}

+ {{- end }} {{- if ne .Date .Lastmod }} @@ -21,8 +26,9 @@ {{- if .IsTranslated }}

{{- i18n "available_translations" }}: + | {{ range .Translations }} - {{ with .Language.LanguageName }}{{ . }}{{ else }}{{ .Lang }}{{ end }} + {{ with .Language.LanguageName }}{{ . }}{{ else }}{{ .Lang }}{{ end }} | {{- end }}

{{- end }} @@ -36,7 +42,6 @@ {{ .TableOfContents }} {{ end }} -
{{ .Content }}
diff --git a/layouts/index.atom b/layouts/index.atom deleted file mode 100644 index bb50e4c..0000000 --- a/layouts/index.atom +++ /dev/null @@ -1,29 +0,0 @@ -{{ printf "" | safeHTML }} - - {{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}{{ with .Site.Params.Subtitle }} - {{ . | safeHTML }}{{ end }} - - - {{ with .Site.Copyright }}{{ . }}{{ else }}© {{ now.Year }} {{ $.Site.Author.name }}{{ end }} - Hugo -- gohugo.io - {{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML }} - - {{ .Site.Author.name }}{{ with .Site.Author.email }} - {{ . }}{{ end }} - - {{ .Permalink }} - {{ $limit := cond (gt .Site.Params.feedLimit 0) .Site.Params.feedLimit 10 }} - {{ range first $limit (where .Site.RegularPages "File.Dir" "!=" "/") }} - - {{ .Permalink }} - {{ .Title }} - {{ with .Params.author }} - {{ . }}{{ end }}{{ range .Params.tags }} - {{ end }} - {{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML }} - {{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}{{ with .Params.license }} - {{ . | safeHTML }}{{ end }} - {{ .Content | html }} - - {{ end }} - \ No newline at end of file diff --git a/layouts/index.json b/layouts/index.json deleted file mode 100644 index 6e4c75b..0000000 --- a/layouts/index.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "https://jsonfeed.org/version/1", - "title": "{{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}", - "home_page_url": "{{ .Site.BaseURL }}", - "feed_url": "{{ with .OutputFormats.Get "json" }}{{ .Permalink }}{{ end }}", - "description": "Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}", - "favicon": "{{ "assets/icon.png" | absURL }}", - "icon": "{{ "assets/icon.png" | absURL }}", - "author": { - "name": "{{ with .Site.Author.name }}{{ . }}{{ end }}" - }, - "items": - {{- $limit := cond (gt .Site.Params.feedLimit 0) .Site.Params.feedLimit 10 -}} - {{- $pages := first $limit (where .Site.RegularPages "File.Dir" "!=" "/") -}} - {{- $.Scratch.Add "index" slice -}} - {{- range $pages -}} - {{- $.Scratch.Add "index" (dict "id" .Permalink "url" .Permalink "title" .Title "summary" .Summary "content_html" .Content "tags" .Params.tags "date_published" (.Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML) "date_modified" ( .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML ) ) -}} - {{- end -}} - {{- $.Scratch.Get "index" | jsonify -}} -} \ No newline at end of file diff --git a/layouts/index.rss b/layouts/index.rss deleted file mode 100644 index d093962..0000000 --- a/layouts/index.rss +++ /dev/null @@ -1,30 +0,0 @@ -{{ printf "" | safeHTML }} - - - {{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }} - {{ .Permalink }} - Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }} - Hugo -- gohugo.io{{ with .Site.LanguageCode }} - {{.}}{{end}}{{ with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Author.email }} - {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}} - {{ with .Site.Copyright }}{{ . }}{{ else }}© {{ now.Year }} {{ $.Site.Author.name }}{{ end }}{{ if not .Date.IsZero }} - {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}{{ end }} - https://cyber.harvard.edu/rss/rss.html - {{ with .OutputFormats.Get "RSS" }} - {{ printf "" .Permalink .MediaType | safeHTML }} - {{ end }} - {{ $limit := cond (gt .Site.Params.feedLimit 0) .Site.Params.feedLimit 10 }} - {{ range first $limit (where .Site.RegularPages "File.Dir" "!=" "/") }} - - {{ .Title }} - {{ .Permalink }}{{ range .Params.tags }} - {{ . }}{{ end }} - {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} - {{ with .Site.Author.email }}{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}} - {{ .Permalink }} - {{ .Content | html }} - - {{ end }} - - \ No newline at end of file diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 7dc93f8..4253a93 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -7,11 +7,12 @@ {{ if $.Site.IsMultiLingual }}

{{ i18n "multilingual" }}: +| {{ range $.Site.Languages }} -{{ with .LanguageName }}{{ . }}{{ else }}{{ .Lang }}{{ end }} +{{ with .LanguageName }}{{ . }}{{ else }}{{ .Lang }}{{ end }} | {{ end }}

{{ end }} -

{{ with $.Site.Copyright }}{{ . | markdownify }}{{ else }}© {{ now.Year }} {{ with $.Site.Author.name }}{{ . }}{{ else }}{{ $.Site.Title }}{{ end }}{{ end }}

\ No newline at end of file +

{{ with $.Site.Copyright }}{{ . | markdownify }}{{ else }}© {{ now.Year }} {{ with $.Site.Author.name }}{{ . }}{{ else }}{{ $.Site.Title }}{{ end }}{{ end }}

diff --git a/layouts/partials/head.html b/layouts/partials/head.html index f7c50af..df5096e 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,14 +1,26 @@ +{{ if .IsHome }}{{ $.Site.Title | safeHTML }}{{ else }}{{ .Title | safeHTML }}{{ end }} + + +{{- /* Some sane tags default */ -}} +{{ hugo.Generator }} - -{{ if .IsHome }}{{ $.Site.Title }}{{ else }}{{ .Title }}{{ end }} - + + + + + + +{{- /* Linking all of the output formats for discovery. */ -}} +{{ range .OutputFormats }} +{{ printf "" .Rel .MediaType.Type .Permalink | safeHTML }} +{{ end }} + + +{{- /* Persistent theme. +It's a very small script so there's little effect on perceived performance. */ -}} - - - - diff --git a/static/css/main.css b/static/css/main.css index da1db2d..466cc0e 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -1,16 +1,24 @@ -html:root { - --foreground: #000000; - --foreground-light: #363537; +:root { + /* The color palette. */ --background: #ffffff; --background-light: #E6E6E6; + --foreground: #000000; + --foreground-light: #363537; --grey: #454545; - --fontFamily: serif; - --fontSize: 1.7vw; - --verticalRhythm: 24px; - --contentWidth: 900px; + + /* The fonts. */ + --body-family: serif; + --header-family: sans-serif; + + /* Spacing options. */ + --font-size: 1.7vw; + --vertical-rhythm: 24px; + --content-width: 900px; + + --border-style: var(--foreground) solid 1px; } -html[data-theme="dark"]:root { +[data-theme="dark"]:root { --foreground: #FFFFFF; --foreground-light: #E6E6E6; --background: #000000; @@ -18,7 +26,8 @@ html[data-theme="dark"]:root { --grey: #919191; } -html { +:root { + font-size: var(--font-size); margin: 0; padding: 0; } @@ -28,31 +37,31 @@ html { body { background: var(--background); color: var(--foreground); - font-family: var(--fontFamily); - font-size: var(--fontSize); - line-height: var(--verticalRhythm); + font-family: var(--body-family); + font-size: var(--font-size); + line-height: var(--vertical-rhythm); margin: 0 auto; - max-width: var(--contentWidth); + max-width: var(--content-width); padding: 1rem; } nav { - margin: var(--verticalRhythm) auto; + margin: 1rem auto; } article h2 { - margin-top: calc(var(--verticalRhythm) * 3); + margin-top: 3rem; } article h3 { - margin-top: calc(var(--verticalRhythm) * 2); + margin-top: 2rem; } /* Text formatting */ h1, h2, h3, h4, h5, h6 { - font-family: sans-serif; + font-family: var(--header-family); line-height: 1.25; } @@ -69,19 +78,8 @@ dd, li, p, td { } dd, p { - margin-top: var(--verticalRhythm); - margin-bottom: var(--verticalRhythm); -} - -table, thead, tbody { - border: var(--foreground) solid 1px; - margin: 0 auto; - border-collapse: collapse; -} - -th, td { - border: var(--foreground) solid 1px; - padding: 1rem; + margin-top: 1rem; + margin-bottom: 1rem; } tr:nth-child(even) { @@ -91,10 +89,11 @@ tr:nth-child(even) { pre { background: var(--background-light); border: var(--background) solid 1px; + font-size: 1rem; line-height: 1.5; - margin-top: var(--verticalRhythm); - margin-bottom: var(--verticalRhythm); - padding: calc(var(--verticalRhythm) / 2); + margin-top: 1rem; + margin-bottom: 1rem; + padding: 0.5rem; overflow: auto; } @@ -103,40 +102,63 @@ aside { color: var(--grey); border: 1px solid var(--grey); border-left: 3px solid var(--grey); - font-size: calc(var(--fontSize) * (1 - var(--vertical-rhythm-reduction))); - line-height: calc(var(--verticalRhythm) * (1 + var(--vertical-rhythm-reduction))); - margin: var(--verticalRhythm) 0; - padding: calc(var(--verticalRhythm) / 2); + font-size: calc(1rem * (1 - var(--vertical-rhythm-reduction))); + line-height: calc(1rem * (1 + var(--vertical-rhythm-reduction))); + margin: 1rem 0; + padding: 0.5rem; width: 100%; } /* Multimedia blocks */ img, video, audio, iframe { - width: 100%; + display: block; height: auto; + max-width: 100%; + margin: auto; +} + +table { + border: var(--border-style); + border-collapse: collapse; + margin: auto; +} + +thead, tbody { + margin: 0 auto; +} + +th, td { + border: var(--border-style); + padding: 1rem; +} + +ol, ul { + line-height: 1.5; } figure { - margin-bottom: calc(var(--verticalRhythm) * 2); + margin: 2rem auto; +} + +figure > * { + margin: 1rem auto; +} + +figcaption { + text-align: center; + font-size: 1rem; } svg { - --size: var(--fontSize); + --size: var(--font-size); height: var(--size); width: var(--size); fill: currentColor; } -footer { - display: flex; - justify-content: space-evenly; - align-items: center; - flex-flow: column nowrap; -} - blockquote { - width: 100%; + margin: 2rem 1rem; } blockquote footer { @@ -146,12 +168,21 @@ blockquote footer { } +/* Semantic blocks */ +footer { + display: flex; + justify-content: space-evenly; + align-items: center; + flex-flow: column wrap; +} + + /* Layout styles. */ .site__title { display: inline-block; - font-size: calc(var(--fontSize) * 2); - margin-bottom: var(--verticalRhythm); - margin-right: calc(var(--verticalRhythm) / 2); + font-size: calc(var(--font-size) * 2); + margin-bottom: 1rem; + margin-right: 0.5rem; } .site__links { @@ -163,7 +194,7 @@ blockquote footer { border: var(--foreground) solid 1px; color: var(--foreground); cursor: pointer; - padding: calc(var(--verticalRhythm) / 2); + padding: 0.5rem; position: absolute; right: 0; top: 0; @@ -174,14 +205,14 @@ blockquote footer { display: flex; justify-content: space-evenly; padding: 0; - margin: var(--verticalRhythm); + margin: 1rem; } .post { align-items: center; display: flex; justify-content: space-between; - margin-top: var(--verticalRhythm); + margin-top: 1rem; } .post h1 { @@ -189,7 +220,7 @@ blockquote footer { } .post__meta > * { - margin: calc(var(--verticalRhythm) / 2) auto; + margin: 0.5rem auto; } .icon { @@ -203,18 +234,19 @@ blockquote footer { /* Mobile styles */ @media (max-width: 860px) { html:root { - --fontSize: 18px; + --font-size: 18px; } .post { align-items: unset; flex-flow: column; - margin-bottom: var(--verticalRhythm); + margin-bottom: 1rem; } } @media all and (min-width: 1000px) { html:root { - --fontSize: 24px; + --font-size: 20px; } -} \ No newline at end of file +} +