From 8ec59f826121a6c89100ab75966f2bba6fbb969b Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Thu, 24 Jan 2019 09:37:29 -0800 Subject: [PATCH] Add SEO metadata partial and bump Hugo version to 0.53 (#508) Signed-off-by: lucperkins --- netlify.toml | 2 +- website/assets/sass/style.sass | 20 +++++------ website/config.toml | 13 +++++--- website/layouts/_default/baseof.html | 8 ++--- website/layouts/index.html | 2 +- website/layouts/partials/css.html | 26 +++++++-------- website/layouts/partials/docs/header.html | 6 ++-- website/layouts/partials/docs/sidebar.html | 10 +++--- website/layouts/partials/footer.html | 2 +- website/layouts/partials/home/hero.html | 2 +- website/layouts/partials/home/info.html | 14 ++++---- website/layouts/partials/home/social.html | 12 +++---- website/layouts/partials/javascript.html | 10 +++--- website/layouts/partials/meta.html | 39 ++++++++++++++++++++++ website/layouts/partials/navbar.html | 2 +- website/layouts/shortcodes/providers.html | 8 ++--- website/layouts/shortcodes/svg.html | 6 ++-- 17 files changed, 111 insertions(+), 71 deletions(-) diff --git a/netlify.toml b/netlify.toml index 214bb3cbb..a61f89df4 100644 --- a/netlify.toml +++ b/netlify.toml @@ -4,7 +4,7 @@ publish = "website/public" command = "make production-build" [build.environment] -HUGO_VERSION = "0.50" +HUGO_VERSION = "0.53" [context.deploy-preview] command = "make preview-build" diff --git a/website/assets/sass/style.sass b/website/assets/sass/style.sass index 662127be0..b41c8c27b 100644 --- a/website/assets/sass/style.sass +++ b/website/assets/sass/style.sass @@ -1,13 +1,13 @@ -{{- $fonts := .Site.Params.fonts }} -{{- $fontSlice := (slice) }} -{{- range $fonts }} -{{- $fontSlice = $fontSlice | append (printf "%s:%s" (replace .name " " "+") (delimit .sizes ",")) }} -{{- end }} -{{- $fontsUrl := printf "https://fonts.googleapis.com/css?family=%s" (delimit $fontSlice "|") }} -{{- $sansSerifFont := .Site.Params.sansSerifFont }} -//{{- $monospaceFont := .Site.Params.monospaceFont }} -{{- $fontAwesomeVersion := .Site.Params.fontAwesomeVersion }} -{{- $fontAwesomeUrl := printf "https://use.fontawesome.com/releases/v%s/css/all.css" $fontAwesomeVersion }} +{{ $fonts := .Site.Params.fonts }} +{{ $fontSlice := (slice) }} +{{ range $fonts }} +{{ $fontSlice = $fontSlice | append (printf "%s:%s" (replace .name " " "+") (delimit .sizes ",")) }} +{{ end }} +{{ $fontsUrl := printf "https://fonts.googleapis.com/css?family=%s" (delimit $fontSlice "|") }} +{{ $sansSerifFont := .Site.Params.sansSerifFont }} +//{{ $monospaceFont := .Site.Params.monospaceFont }} +{{ $fontAwesomeVersion := .Site.Params.fontAwesomeVersion }} +{{ $fontAwesomeUrl := printf "https://use.fontawesome.com/releases/v%s/css/all.css" $fontAwesomeVersion }} @charset "utf-8" @import url({{ $fontsUrl }}) diff --git a/website/config.toml b/website/config.toml index 31ffb6aa4..fe3ae4e51 100644 --- a/website/config.toml +++ b/website/config.toml @@ -21,13 +21,15 @@ favicon = "https://raw.githubusercontent.com/cncf/artwork/master/virt sansSerifFont = "Noto Sans TC" #monospaceFont = "Fira Mono" fontAwesomeVersion = "5.5.0" -description = """ +description = "Virtual Kubelet is an open-source Kubernetes kubelet implementation that masquerades as a kubelet" +intro = """ **Virtual Kubelet** is an open-source [Kubernetes kubelet](https://kubernetes.io/docs/reference/generated/kubelet/) implementation that *masquerades* as a kubelet. This allows Kubernetes nodes to be backed by Virtual Kubelet [**providers**](/docs/providers) such as serverless cloud container platforms. """ [params.logos] +site = "https://raw.githubusercontent.com/cncf/artwork/master/virtualkubelet/horizontal/color/virtualkubelet-horizontal-color.png" hero = "https://raw.githubusercontent.com/cncf/artwork/master/virtualkubelet/horizontal/white/virtualkubelet-horizontal-white.png" navbar = "https://raw.githubusercontent.com/cncf/artwork/master/virtualkubelet/horizontal/white/virtualkubelet-horizontal-white.png" sidebar = "https://raw.githubusercontent.com/cncf/artwork/master/virtualkubelet/stacked/white/virtualkubelet-stacked-white.png" @@ -43,10 +45,11 @@ url = "https://github.com/virtual-kubelet/virtual-kubelet" icon = "github" [[params.social]] -name = "Twitter" -color = "twitter-blue" -url = "https://twitter.com/virtualkubelet" -icon = "twitter" +name = "Twitter" +color = "twitter-blue" +url = "https://twitter.com/virtualkubelet" +icon = "twitter" +handle = "virtualkubelet" [[params.social]] name = "Slack" diff --git a/website/layouts/_default/baseof.html b/website/layouts/_default/baseof.html index 3d7e762df..f521d3622 100644 --- a/website/layouts/_default/baseof.html +++ b/website/layouts/_default/baseof.html @@ -1,11 +1,11 @@ -{{- .Scratch.Set "numFigures" 1 }} -{{- $pageType := cond .IsHome "home" .Section }} +{{ .Scratch.Set "numFigures" 1 }} +{{ $pageType := cond .IsHome "home" .Section }} - + {{ partial "meta.html" . }} - {{ block "title" . }}{{ .Site.Title }}{{ end }} + {{ block "title" . }}{{ site.Title }}{{ end }} {{ partial "css.html" . }} diff --git a/website/layouts/index.html b/website/layouts/index.html index aea388297..069da7b07 100644 --- a/website/layouts/index.html +++ b/website/layouts/index.html @@ -1,5 +1,5 @@ {{ define "title" }} -{{ .Site.Title }} | Home +{{ site.Title }} | Home {{ end }} {{ define "main" }} diff --git a/website/layouts/partials/css.html b/website/layouts/partials/css.html index 41626b081..1ade285ee 100644 --- a/website/layouts/partials/css.html +++ b/website/layouts/partials/css.html @@ -1,16 +1,14 @@ -{{- $favicon := .Site.Params.favicon }} -{{- $inServerMode := .Site.IsServer }} -{{- $includePaths := (slice "node_modules") }} -{{- $sass := "sass/style.sass" }} -{{- $cssOutput := "css/style.css" }} -{{- $devOpts := (dict "targetPath" $cssOutput "includePaths" $includePaths "enableSourceMap" true) }} -{{- $prodOpts := (dict "targetPath" $cssOutput "includePaths" $includePaths "outputStyle" "compressed") }} -{{- $cssOpts := cond $inServerMode $devOpts $prodOpts }} -{{- $css := resources.Get $sass | resources.ExecuteAsTemplate $sass . | toCSS $cssOpts }} -{{- if $inServerMode }} +{{ $inServerMode := site.IsServer }} +{{ $includePaths := (slice "node_modules") }} +{{ $sass := "sass/style.sass" }} +{{ $cssOutput := "css/style.css" }} +{{ $devOpts := (dict "targetPath" $cssOutput "includePaths" $includePaths "enableSourceMap" true) }} +{{ $prodOpts := (dict "targetPath" $cssOutput "includePaths" $includePaths "outputStyle" "compressed") }} +{{ $cssOpts := cond $inServerMode $devOpts $prodOpts }} +{{ $css := resources.Get $sass | resources.ExecuteAsTemplate $sass . | toCSS $cssOpts }} +{{ if $inServerMode }} -{{- else }} -{{- $prodCss := $css | fingerprint }} +{{ else }} +{{ $prodCss := $css | fingerprint }} -{{- end }} - +{{ end }} diff --git a/website/layouts/partials/docs/header.html b/website/layouts/partials/docs/header.html index 88911e0d6..c2fb434b7 100644 --- a/website/layouts/partials/docs/header.html +++ b/website/layouts/partials/docs/header.html @@ -1,11 +1,11 @@ -{{- $description := .Params.description }} +{{ $description := .Params.description }}

{{ .Title }}

- {{- with $description }} + {{ with $description }}

{{ . }}

- {{- end }} + {{ end }}
diff --git a/website/layouts/partials/docs/sidebar.html b/website/layouts/partials/docs/sidebar.html index 23027d05f..879692d5d 100644 --- a/website/layouts/partials/docs/sidebar.html +++ b/website/layouts/partials/docs/sidebar.html @@ -1,8 +1,8 @@ -{{- $sidebarLogo := .Site.Params.logos.sidebar }} -{{- $docs := where .Site.Pages "Section" "docs" }} +{{ $sidebarLogo := site.Params.logos.sidebar }} +{{ $docs := where site.Pages "Section" "docs" }}
- +
@@ -11,13 +11,13 @@
- {{- range $docs }} + {{ range $docs }}
{{ .Title }}
- {{- end }} + {{ end }}
diff --git a/website/layouts/partials/footer.html b/website/layouts/partials/footer.html index ff3ed1ec2..d51ca8c06 100644 --- a/website/layouts/partials/footer.html +++ b/website/layouts/partials/footer.html @@ -1,4 +1,4 @@ -{{- $year := now.Year}} +{{ $year := now.Year}}