diff --git a/archetypes/default.md b/archetypes/default.md index 592ee5e..2fcb322 100644 --- a/archetypes/default.md +++ b/archetypes/default.md @@ -1,6 +1,6 @@ +++ title = "" -description = "" +summary = "" [menu.docs] identifier = "" parent = "" diff --git a/assets/styles/common/base.scss b/assets/styles/common/base.scss index f4a24f8..7877bc8 100644 --- a/assets/styles/common/base.scss +++ b/assets/styles/common/base.scss @@ -2,16 +2,22 @@ $site-max-width: 100rem; :root { --site-max-width: #{$site-max-width}; - --nav-height: 4rem; - --header-height: 4.5rem; - --footer-height: 3rem; + + --color-crossfade-duration: 0.25s; + --color-crossfade-ease: ease; } html { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; scroll-behavior: smooth; +} + +body { background: var(--ui-background); color: var(--ui-text); + transition: + background var(--color-crossfade-duration) var(--color-crossfade-ease), + color var(--color-crossfade-duration) var(--color-crossfade-ease); } /* Single column layout, where main content stretches to fill. */ diff --git a/assets/styles/common/colors.scss b/assets/styles/common/colors.scss index 1b6a213..22e4b9e 100644 --- a/assets/styles/common/colors.scss +++ b/assets/styles/common/colors.scss @@ -1,4 +1,4 @@ -:root { +@mixin light { --link-color: #3371cf; --link-visited: #594288; @@ -15,21 +15,37 @@ --ui-overlay-text: var(--ui-text); } +@mixin dark { + --link-color: #8fb1df; + --link-visited: #a089d4; + + --primary-accent: rgb(0, 123, 255); + --primary-accent-transparent: rgba(64, 156, 255, 0.45); + --primary-accent-text: #fff; + + --ui-background: #212121; + --ui-text: #eee; + --ui-text-muted: #999; + --ui-text-bold: #fff; + + --ui-overlay: #333; + --ui-overlay-text: var(--ui-text); +} + +:root { + @include light; +} + @media (prefers-color-scheme: dark) { :root { - --link-color: #8fb1df; - --link-visited: #a089d4; - - --primary-accent: rgb(0, 123, 255); - --primary-accent-transparent: rgba(64, 156, 255, 0.45); - --primary-accent-text: #fff; - - --ui-background: #212121; - --ui-text: #eee; - --ui-text-muted: #999; - --ui-text-bold: #fff; - - --ui-overlay: #333; - --ui-overlay-text: var(--ui-text); + @include dark; } +} + +body.dark-mode { + @include dark; +} + +body.light-mode { + @include light; } \ No newline at end of file diff --git a/assets/styles/common/content.scss b/assets/styles/common/content.scss index e1b4676..cc05d0b 100644 --- a/assets/styles/common/content.scss +++ b/assets/styles/common/content.scss @@ -42,6 +42,9 @@ padding: 0.25em; background: var(--ui-overlay); color: var(--ui-overlay-text); + transition: + background var(--color-crossfade-duration) var(--color-crossfade-ease), + color var(--color-crossfade-duration) var(--color-crossfade-ease); } } @supports not #{'selector\(:has(kbd))'} { @@ -51,6 +54,9 @@ padding: 0.25em; background: var(--ui-overlay); color: var(--ui-overlay-text); + transition: + background var(--color-crossfade-duration) var(--color-crossfade-ease), + color var(--color-crossfade-duration) var(--color-crossfade-ease); } /* and prevent double-styling for nested keys */ kbd kbd { @@ -63,11 +69,16 @@ --pad-x-highlight: 0.125em; padding-left: var(--pad-x-highlight); padding-right: var(--pad-x-highlight); + transition: + background var(--color-crossfade-duration) var(--color-crossfade-ease), + color var(--color-crossfade-duration) var(--color-crossfade-ease); } abbr[title]:after { content: '?'; font-size: var(--script-size); color: var(--ui-text-muted); + transition: + color var(--color-crossfade-duration) var(--color-crossfade-ease); } /* lists */ ul {list-style: disc; margin: 1em 0;} @@ -93,6 +104,9 @@ font-family: monospace; background: var(--ui-overlay); color: var(--ui-overlay-text); + transition: + background var(--color-crossfade-duration) var(--color-crossfade-ease), + color var(--color-crossfade-duration) var(--color-crossfade-ease); padding: 1em; line-height: 2; overflow-x: auto; @@ -105,11 +119,16 @@ font-family: monospace; background: var(--ui-overlay); color: var(--ui-overlay-text); + transition: + background var(--color-crossfade-duration) var(--color-crossfade-ease), + color var(--color-crossfade-duration) var(--color-crossfade-ease); padding: 0.25rem; } :not(.highlight) > pre { line-height: 1.5; background: var(--ui-overlay); + transition: + background var(--color-crossfade-duration) var(--color-crossfade-ease); padding: 1em; } pre code { @@ -133,6 +152,9 @@ figcaption { background: #212121; color: white; + transition: + background var(--color-crossfade-duration) var(--color-crossfade-ease), + color var(--color-crossfade-duration) var(--color-crossfade-ease); font-style: italic; padding: 1em; font-size: 0.8em; @@ -144,10 +166,16 @@ font-weight: 700; background: var(--ui-overlay); color: var(--ui-overlay-text); + transition: + background var(--color-crossfade-duration) var(--color-crossfade-ease), + color var(--color-crossfade-duration) var(--color-crossfade-ease); } th, td { - border: 1px solid var(--ui-text); + border: 1px solid; + border-color: var(--ui-text); padding: 0.5em; + transition: + border-color var(--color-crossfade-duration) var(--color-crossfade-ease); } /* hugo-specific citation footnote */ cite sup { @@ -172,6 +200,8 @@ &:before { content: 'Footnotes'; color: var(--ui-text); + transition: + color var(--color-crossfade-duration) var(--color-crossfade-ease); text-transform: uppercase; font-weight: 900; font-size: 0.8em; @@ -180,7 +210,11 @@ content: ''; width: 100%; margin-left: 1rem; - border-bottom: 1px solid var(--ui-text-muted); + border-bottom: 1px solid; + border-color: var(--ui-text-muted); + transition: + border-color var(--color-crossfade-duration) var(--color-crossfade-ease); + } } } diff --git a/assets/styles/common/mixins.scss b/assets/styles/common/mixins.scss index e69de29..570f412 100644 --- a/assets/styles/common/mixins.scss +++ b/assets/styles/common/mixins.scss @@ -0,0 +1,16 @@ +@mixin shadow-short { + box-shadow: 0 1px 1px rgba(0,0,0,0.11), + 0 2px 2px rgba(0,0,0,0.11), + 0 4px 4px rgba(0,0,0,0.11), + 0 6px 8px rgba(0,0,0,0.11), + 0 8px 16px rgba(0,0,0,0.11); + } + + @mixin shadow-high { + box-shadow: 0 2px 1px rgba(0,0,0,0.09), + 0 4px 2px rgba(0,0,0,0.09), + 0 8px 4px rgba(0,0,0,0.09), + 0 16px 8px rgba(0,0,0,0.09), + 0 32px 16px rgba(0,0,0,0.09); + } + \ No newline at end of file diff --git a/assets/styles/components/nav-docs.scss b/assets/styles/components/nav-docs.scss index 2268467..5c4b8f6 100644 --- a/assets/styles/components/nav-docs.scss +++ b/assets/styles/components/nav-docs.scss @@ -3,7 +3,6 @@ .toggle-menu { display: none; } - .toggle-menu:not(:checked) ~ .menu { display: none; } @@ -15,25 +14,38 @@ text-transform: uppercase; } + +.toggle-menu__label { + margin-bottom: 2em +} + /* navigation menu */ .docs-nav { padding: 1em 0; + #search-form { + margin-bottom: 2em; + } .menu { margin-top: 1em; - > li, > details summary { + > li { + margin-bottom: 2em; + font-weight: 700; + } + > details summary { margin-bottom: 1em; } + display: flex; + flex-flow: column; } details { + display: flex; margin-bottom: 1em; + &[open] {margin-bottom: 2em;} } summary { font-weight: 700; cursor: pointer; - &::marker { - content: ''; - } } .sub-menu { margin-left: 1em; @@ -45,6 +57,7 @@ } .sub-menu { margin-top: 0.5rem; + margin-left: 2em; } li::marker { content: '→ '; @@ -52,11 +65,16 @@ .sub-menu li::marker { content: '↳ '; } + li.active::marker { + content: '• '; + } } .active > a { font-weight: 700; text-decoration: none; - color: inherit; + color: var(--ui-text-bold); + transition: + color var(--color-crossfade-duration) var(--color-crossfade-ease); } } diff --git a/assets/styles/components/nav-section.scss b/assets/styles/components/nav-section.scss index 782c049..d686caa 100644 --- a/assets/styles/components/nav-section.scss +++ b/assets/styles/components/nav-section.scss @@ -1,3 +1,5 @@ +@import "common/mixins.scss"; + .section-nav { .container { display: grid; @@ -10,13 +12,18 @@ gap: 1em; text-decoration: none; background: var(--ui-overlay); - color: var(--ui-overlay-text); - box-shadow: 2px 2px 6px rgba(0,0,0,0.25); + transition: + background var(--color-crossfade-duration) var(--color-crossfade-ease), + color var(--color-crossfade-duration) var(--color-crossfade-ease); + @include shadow-short; &:focus { padding: 1em; border: none; } } + a:link, a:visited { + color: var(--ui-overlay-text); + } .previous { justify-content: start; } diff --git a/assets/styles/components/site-footer.scss b/assets/styles/components/site-footer.scss index 2924b63..bd5cc43 100644 --- a/assets/styles/components/site-footer.scss +++ b/assets/styles/components/site-footer.scss @@ -35,6 +35,8 @@ .copyright a { text-decoration: none; color: var(--ui-text-bold); + transition: + color var(--color-crossfade-duration) var(--color-crossfade-ease); } } diff --git a/assets/styles/components/site-header.scss b/assets/styles/components/site-header.scss index a359676..4185e7c 100644 --- a/assets/styles/components/site-header.scss +++ b/assets/styles/components/site-header.scss @@ -4,6 +4,13 @@ align-items: center; gap: 1em; text-decoration: none; + img { + height: 2rem; + } + svg { + height: 2rem; + width: 100%; + } } .site-icon { height: 2em; @@ -13,24 +20,37 @@ letter-spacing: -0.5px; font-size: 1.25em; } -.site-masthead, .site-masthead:visited { - color: inherit +.site-masthead:link, .site-masthead:visited { + color: var(--ui-text); } -.site-masthead:focus { - color: var(--primary-accent-text); +.color-switcher { + display: grid; + place-items: center; + margin-left: auto; + margin-right: 0.5em; } -.site-header {padding: 1em 0;} - -.site-header a { - font-weight: 500; -} -.site-header .container { - display: flex; - flex-flow: row wrap; - justify-content: space-between; - gap: 1em; +.site-header { + .container { + display: flex; + flex-flow: row wrap; + justify-content: space-between; + gap: 1em; + } + padding: 1em 0; + a { + font-weight: 500; + } + .hang-left { + display: flex; + gap: 1em; + flex-flow: row wrap; + max-width: 100%; + flex-grow: 1; + justify-content: space-between; + } + } .header-nav { @@ -42,6 +62,9 @@ display: flex; flex-flow: row wrap; gap: 1em; + li { + display: grid; + } a { display: flex; align-items: center; diff --git a/assets/styles/components/table-of-contents.scss b/assets/styles/components/table-of-contents.scss index 1f7ae19..4f6b371 100644 --- a/assets/styles/components/table-of-contents.scss +++ b/assets/styles/components/table-of-contents.scss @@ -3,6 +3,8 @@ font-weight: 900; text-transform: uppercase; color: var(--ui-text-muted); + transition: + color var(--color-crossfade-duration) var(--color-crossfade-ease); } #TableOfContents { ul { diff --git a/assets/styles/features/links.scss b/assets/styles/features/links.scss index 5cc437e..0d19bbf 100644 --- a/assets/styles/features/links.scss +++ b/assets/styles/features/links.scss @@ -8,15 +8,15 @@ a:link { a:visited { color: var(--link-visited); + transition: + color var(--color-crossfade-duration) var(--color-crossfade-ease); } -a:focus { - outline: none; - background: var(--primary-accent); - color: var(--primary-accent-text); +*:focus { + outline: 1px dashed; + outline-offset: 8px; border-radius: 2px; text-decoration: none; - padding: 4px; } a:hover { diff --git a/assets/styles/features/search.scss b/assets/styles/features/search.scss index fe448fa..61d49f0 100644 --- a/assets/styles/features/search.scss +++ b/assets/styles/features/search.scss @@ -9,6 +9,9 @@ font-weight: 900; background: var(--primary-accent-transparent); color: var(--ui-text-bold); + transition: + background var(--color-crossfade-duration) var(--color-crossfade-ease), + color var(--color-crossfade-duration) var(--color-crossfade-ease); } #search-results { @@ -18,7 +21,10 @@ } #search-results li:not(:first-child) { - border-top: 1px solid var(--ui-text-muted); + border-top: 1px solid; + border-color: var(--ui-text-muted); + transition: + border-color var(--color-crossfade-duration) var(--color-crossfade-ease); } #search-results li { @@ -45,11 +51,15 @@ #search-input { background: var(--ui-overlay); color: var(--ui-overlay-text); + transition: + background var(--color-crossfade-duration) var(--color-crossfade-ease), + color var(--color-crossfade-duration) var(--color-crossfade-ease); filter: drop-shadow(2px 2px 2px rgba(0,0,0,0.15)); border-radius: 100rem; border: 0; padding: 0.5rem 1rem; margin-right: 0.5rem; + width: 100%; flex-shrink: 1; height: 2rem; box-sizing: border-box; @@ -60,6 +70,9 @@ border: 0; background: var(--primary-accent); color: var(--primary-accent-text); + transition: + background var(--color-crossfade-duration) var(--color-crossfade-ease), + color var(--color-crossfade-duration) var(--color-crossfade-ease); border-radius: 4px; height: 2rem; filter: drop-shadow(2px 2px 2px rgba(0,0,0,0.15)); diff --git a/assets/styles/layouts/responsive.scss b/assets/styles/layouts/responsive.scss index 90a0633..b0e8e1f 100644 --- a/assets/styles/layouts/responsive.scss +++ b/assets/styles/layouts/responsive.scss @@ -12,25 +12,22 @@ body { display: grid; grid-template-columns: 1fr 3fr; + grid-template-rows: auto 0 1fr auto; height: calc(100 * var(--vh, 1vh)); } .site-header, .scroll-margin, .site-footer { grid-column: span 2 } - .site-footer { /* fixed height footer */ - height: var(--footer-height); - } - .docs-nav { grid-column: 1; - height: calc(100 * var(--vh, 1vh) - var(--header-height) - var(--footer-height)); overflow-y: auto; padding: 0; + min-width: 20rem; } + main { grid-column: 2; - height: calc(100 * var(--vh, 1vh) - var(--header-height) - var(--footer-height)); overflow-y: auto; scrollbar-width: none; } @@ -39,7 +36,9 @@ display: none; } - .docs-nav .menu {margin-top: 0;} + .docs-nav .menu { + margin-top: 0; + } .page-header { padding: 0; @@ -52,13 +51,13 @@ } .toggle-menu:not(:checked) ~ .menu { - display: unset; + display: flex; } .toggle-menu__label { display: none; } - .docs-nav, .page-header {padding: 1rem 0;} + .docs-nav, .page-header {padding: 2rem 0;} } @@ -66,11 +65,11 @@ @media (min-width: 75rem) { body { - grid-template-columns: 20rem 1fr; + grid-template-columns: auto 1fr; } .page { display: grid; - grid-template-columns: 40rem 1fr; + grid-template-columns: 1fr minmax(auto,20rem); } .page-header, .content, @@ -83,13 +82,11 @@ grid-column: 2; grid-row: span 4; padding: 0; - min-height: calc(100 * var(--vh, 1vh) - var(--header-height) - var(--footer-height)); } .page .toc .container { margin: 0; position: sticky; - top: 1rem; - max-height: calc(100 * var(--vh, 1vh) - var(--header-height) - var(--footer-height)); + top: 2rem; overflow-y: auto; } @@ -115,7 +112,7 @@ { display: grid; grid-template-columns: minmax(0, 1fr) minmax(0, 80ch) minmax(0, 1fr); - padding: 0 1rem; + padding: 0 2rem; > .container { grid-column: 2; padding: 0; @@ -123,7 +120,7 @@ } .page-header { - padding-top: 1rem; + padding-top: 2rem; } .page-footer { padding-bottom: 1rem; @@ -153,7 +150,7 @@ .site-footer, .scroll-margin { - grid-column: 2 / span 2; + grid-column: 1 / span 4; } /* except now the page is fixed to maxwidth and the toc can "grow" */ @@ -174,7 +171,6 @@ .docs-nav { position: sticky; width: 20rem; - place-self: end; } } \ No newline at end of file diff --git a/assets/styles/layouts/single.scss b/assets/styles/layouts/single.scss index 291ba92..aeda7b0 100644 --- a/assets/styles/layouts/single.scss +++ b/assets/styles/layouts/single.scss @@ -8,14 +8,19 @@ .page-summary { line-height: 1.5; max-width: 80ch; + margin-bottom: 1rem; } .lastmod { margin-top: 1rem; line-height: 1.5; color: var(--ui-text-muted); + transition: + color var(--color-crossfade-duration) var(--color-crossfade-ease); } .language-list { + margin-top: 0.5rem; display: flex; flex-flow: wrap; list-style: none; + gap: 1em; } \ No newline at end of file diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index af36523..77dcaf3 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -5,34 +5,69 @@ -{{ $screen := resources.Get "styles/screen.scss" | toCSS | minify | fingerprint }} - -{{ $print := resources.Get "styles/print.scss" | toCSS | minify | fingerprint }} + +{{- /* print layout */ -}} +{{- $print := resources.Get "styles/print.scss" | toCSS | minify | fingerprint }} -{{ $script := resources.Get "scripts/main.js" | js.Build "script.js" | minify | fingerprint }} + +{{- /* web layout */ -}} +{{- $theme := resources.Get "styles/screen.scss" | toCSS }} +{{- with resources.Get "styles/custom.scss" }} +{{- $custom := . | toCSS }} +{{- $screen := slice $theme $custom | resources.Concat "styles/screen.css" | minify | fingerprint }} + +{{- else }} +{{- $screen := $theme | minify | fingerprint }} + +{{- end }} + +{{- /* scripts */ -}} +{{- $theme := resources.Get "scripts/main.js" | js.Build "script.js" | minify | fingerprint }} +{{ with resources.Get "scripts/custom.js" }} +{{ $custom := . }} +{{ $script := slice $theme $custom | resources.Concat "scripts/main.js" | js.Build "script.js" | minify | fingerprint}} +{{ else }} +{{ $script := $theme | js.Build "script.js" | minify | fingerprint}} + +{{ end }} + +{{/* optional features */ -}} {{ partial "styles/external-links.html" . }} + {{ if .Site.Params.borders }} {{ partial "styles/borders.html" . }} -{{ end }} - -{{ partial "seo.html" . }} -{{ block "head" . }} +{{ end -}} + +{{- /* import Fork Awesome (TODO: replace with proper SVG icons?) */ -}} + + +{{ partial "seo.html" . -}} +{{- block "head" . -}} {{ end }} - - {{ partial "site-header.html" . }} - {{ block "main" . }} - {{ end }} - {{ partial "site-footer.html" . }} - + +{{ partial "site-header.html" . }} +{{ block "main" . }} +{{ end }} +{{ partial "site-footer.html" . }} + \ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 2783e36..888f439 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -7,7 +7,9 @@

{{ .Title }}

{{.Page.Summary | plainify}}

-

Last modified {{ .Lastmod.Format "Mon Jan 2, 2006" }}
Edit this page

+

Last modified {{ .Lastmod.Format "Mon Jan 2, 2006" }} + {{ partial "edit-link.html" . }} +

{{ partial "i18nlist.html" . }} diff --git a/layouts/index.html b/layouts/index.html index 54335ed..51bdb66 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -17,7 +17,10 @@
{{ .Content }} -

Last modified {{ .Lastmod.Format "Mon Jan 2, 2006" }}
Edit this page

+

Last modified + {{ .Lastmod.Format "Mon Jan 2, 2006" }} + {{ partial "edit-link.html" . }} +

diff --git a/layouts/partials/color-switcher.html b/layouts/partials/color-switcher.html new file mode 100644 index 0000000..6651467 --- /dev/null +++ b/layouts/partials/color-switcher.html @@ -0,0 +1,180 @@ +
+
+ +
+
+ + \ No newline at end of file diff --git a/layouts/partials/edit-link.html b/layouts/partials/edit-link.html new file mode 100644 index 0000000..e7fafa7 --- /dev/null +++ b/layouts/partials/edit-link.html @@ -0,0 +1,46 @@ +{{ with .File }} + {{ $path := .Path }} + {{ $editLink := ""}} + {{ if $.Site.Params.editLink.enabled }} + {{ with $.Site.Params.editLink }} + {{ if eq .forge "github" }} + {{/* + link of the form: + https://github.com/name/repo/edit/main/content/en/path/to/foo.md + */}} + {{ $editLink = + ( + printf "https://github.com/%s/edit/%s/%s/%s" + .repo + .branch + $.Site.Params.contentDir + $path + ) + }} + {{ else if eq .forge "gitea" }} + {{/* + link of the form: + gitea.example/name/repo/_edit/main/content/en/path/to/foo.md + */}} + {{ + $editLink = + ( + printf "%s/%s/_edit/%s/%s/%s" + .forgeUrl + .repo + .branch + $.Site.Params.contentDir + $path + ) + }} + {{ end }} + {{ end }} + {{ with $editLink }} + +
+ Edit this page + + {{ else }} + {{ end }} + {{ end }} +{{ end }} \ No newline at end of file diff --git a/layouts/partials/nav-docs.html b/layouts/partials/nav-docs.html index 1f2dae8..8bb207e 100644 --- a/layouts/partials/nav-docs.html +++ b/layouts/partials/nav-docs.html @@ -1,58 +1,72 @@ \ No newline at end of file diff --git a/layouts/partials/seo.html b/layouts/partials/seo.html index 556d500..e455bf3 100644 --- a/layouts/partials/seo.html +++ b/layouts/partials/seo.html @@ -1,132 +1,132 @@ - {{ "" | safeHTML }} - {{ .Title }} | {{ .Site.Title }} - - - - +{{ "" | safeHTML }} +{{ .Title }} • {{ .Site.Title }} + + + + - {{- with or .Description .Summary .Site.Params.description }} - {{ "" | safeHTML }} - - - - - {{ end -}} - {{ "" | safeHTML }} - - - - - +{{- with or .Description .Summary .Site.Params.description }} +{{ "" | safeHTML }} + + + + +{{ end -}} +{{ "" | safeHTML }} + + + + + - {{- $cover := ($.Resources.ByType "image").GetMatch "{*cover*,*thumbnail*,*featured*}" -}} - {{ $icon := resources.GetMatch (default "" .Site.Params.icon) -}} - {{- $staticIcon := "icon.png" | absURL -}} - {{- with or .Params.cover $cover $icon }} - {{ "" | safeHTML }} - - - {{- with .Width }} - - {{- end }} - {{- with .Height }} - - {{- end }} - - - {{- else }} - {{ "" | safeHTML }} - - - - - {{- end -}} +{{- $cover := ($.Resources.ByType "image").GetMatch "{*cover*,*thumbnail*,*featured*}" -}} +{{ $icon := resources.GetMatch (default "" .Site.Params.icon) -}} +{{- $staticIcon := "icon.png" | absURL -}} +{{- with or .Params.cover $cover $icon }} +{{ "" | safeHTML }} + + +{{- with .Width }} + +{{- end }} +{{- with .Height }} + +{{- end }} + + +{{- else }}{{/* no image found */}} +{{ "" | safeHTML }} + + + + +{{- end -}} - {{/*=== author ===*/}} - {{ with or .Params.author .Site.Params.author -}} - {{ "" | safeHTML }} - - - - - {{- end -}} +{{/*=== author ===*/}} +{{ with or .Params.author .Site.Params.author -}} +{{ "" | safeHTML }} + + + + +{{- end -}} - {{/*=== published and updated ===*/}} - {{ "" | safeHTML }} - {{- with .Date }} - - - {{ end -}} - {{ with .Lastmod -}} - - {{ end -}} +{{/*=== published and updated ===*/}} +{{ "" | safeHTML }} +{{- with .Date }} + + +{{ end -}} +{{ with .Lastmod -}} + +{{ end -}} - {{/*=== section and keywords ===*/}} - {{- with.Params.category -}} - - - {{- end -}} - {{- with .Params.tags }} - - {{- end -}} +{{/*=== section and keywords ===*/}} +{{- with.Params.category -}} + + +{{- end -}} +{{- with .Params.tags }} + +{{- end -}} - {{- if isset .Params "date" -}} - {{ "" | safeHTML }} - - - {{- else -}} - {{ "" | safeHTML }} - - - {{- end -}} + } + +{{- else -}} +{{ "" | safeHTML }} + + +{{- end -}} - {{/* auxiliary info */}} - {{ "" | safeHTML }} - {{- with $icon }} - - {{- else -}} - - {{- end }} - - - - {{ with .OutputFormats.Get "RSS" -}} - - {{- end }} - - +{{/* auxiliary info */}} +{{ "" | safeHTML }} +{{- with $icon }} + +{{- else }} + +{{- end }} + + + +{{ with .OutputFormats.Get "RSS" -}} + +{{- end }} + + diff --git a/layouts/partials/site-header.html b/layouts/partials/site-header.html index c68dae3..876c502 100644 --- a/layouts/partials/site-header.html +++ b/layouts/partials/site-header.html @@ -1,10 +1,23 @@
- - -

{{.Site.Params.title}}

- +
+ + {{ with .Site.Params.masthead.image }} + + {{ end }} + {{ with resources.Get .Site.Params.masthead.svg }} + {{ .Content | safeHTML }} + {{ end }} + {{if .Site.Params.masthead.hideTitle}} + {{ else }} +

{{or .Site.Params.masthead.title .Site.Title}}

+ {{ end }} + + {{ partial "color-switcher.html" . }} +
+ {{ if in .Site.Params.search.showIn "header" }} {{ partial "search/search-form.html" . }} + {{ end }} {{ partial "nav-header.html" . }}
diff --git a/layouts/partials/styles/borders.html b/layouts/partials/styles/borders.html index 86aa879..17774bb 100644 --- a/layouts/partials/styles/borders.html +++ b/layouts/partials/styles/borders.html @@ -1,18 +1,26 @@ \ No newline at end of file diff --git a/layouts/partials/styles/external-links.html b/layouts/partials/styles/external-links.html index 113d40f..bc1f43f 100644 --- a/layouts/partials/styles/external-links.html +++ b/layouts/partials/styles/external-links.html @@ -1,5 +1,4 @@