diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index a6d14a4..52713df 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,13 +1,52 @@ - {{ partial "head" . }} + + + {{ block "metaTitle" . }} + {{ .Title }} + {{ end }} + + + + + + + + + + + + + + + + {{ block "metaSocial" . }} + + + + + + + + + + + + {{ end }} + + + {{ $sass := resources.Get "/scss/style.scss" }} + {{ $style := $sass | resources.ToCSS | minify | fingerprint }} + + + - {{ block "header" . }}{{ partial "header" . }}{{end}} + {{ partial "header" . }} {{ block "main" . }}{{ end }} - {{ block "footer" . }}{{ partial "footer" . }}{{end}} + {{ partial "footer" . }} {{ $mobilemenu := resources.Get "js/menu.js" }} {{ $randomizer := resources.Get "js/random.js" }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 1ece2d1..09aebe4 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,3 +1,6 @@ +{{ define "metaTitle" }} + {{ .Title }} ∴ {{ .Site.Title }} +{{ end }} {{ define "main" }}
diff --git a/layouts/index.html b/layouts/index.html index fe71293..27179f7 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,3 +1,7 @@ +{{ define "metaTitle" }} + {{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }} + {{ if (not $paginator.HasPrev) }}{{ .Site.Title }} ∴ Handpicked Albums by the Glitch Family{{ else }}{{ .Site.Title }} ∴ Albums (Page {{ $paginator.PageNumber }}) {{ end }} +{{ end }} {{ define "main" }} {{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html deleted file mode 100644 index 62cbdc5..0000000 --- a/layouts/partials/head.html +++ /dev/null @@ -1,33 +0,0 @@ - - - {{ .Title }} ∴ {{ $.Site.Title }} - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ $sass := resources.Get "/scss/style.scss" }} - {{ $style := $sass | resources.ToCSS | minify | fingerprint }} - - diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 50e4412..a74c3ee 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -11,7 +11,7 @@