diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index b76244d3b..000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "themes/docsy"] - path = themes/docsy - url = https://github.com/google/docsy.git diff --git a/Dockerfile b/Dockerfile index 33d7a1e5e..5dc60b0c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,10 +18,9 @@ RUN apk add --no-cache \ WORKDIR /src -# Required for PostCSS -RUN npm install -G \ - autoprefixer \ - postcss-cli +COPY package*.json ./ + +RUN npm ci RUN mkdir -p /usr/local/src && \ cd /usr/local/src && \ diff --git a/Makefile b/Makefile index a06c60cd9..f7bdbcb63 100644 --- a/Makefile +++ b/Makefile @@ -13,13 +13,25 @@ # limitations under the License. CONTAINER_ENGINE ?= docker -CONTAINER_RUN := $(CONTAINER_ENGINE) run --user : --rm -it -v "$(CURDIR):/src" +CONTAINER_RUN := $(CONTAINER_ENGINE) run --rm -it -v "$(CURDIR):/src" +CONTAINER_RUN_TTY := $(CONTAINER_ENGINE) run --rm -it HUGO_VERSION := $(shell grep ^HUGO_VERSION netlify.toml | tail -n 1 | cut -d '=' -f 2 | tr -d " \"\n") CONTAINER_IMAGE := k8s-contrib-site-hugo -REPO_ROOT :=${CURDIR} -# Fast NONBlOCKING IO to stdout caused by the hack/gen-content.sh script can -# cause Netlify builds to terminate unexpectantly. This forces stdout to block. +CONTAINER_HUGO_MOUNTS = \ + --read-only \ + --mount type=bind,source=$(CURDIR)/.git,target=/src/.git,readonly \ + --mount type=bind,source=$(CURDIR)/assets,target=/src/assets,readonly \ + --mount type=bind,source=$(CURDIR)/content,target=/src/content,readonly \ + --mount type=bind,source=$(CURDIR)/external-sources,target=/src/external-sources,readonly \ + --mount type=bind,source=$(CURDIR)/hack,target=/src/hack,readonly \ + --mount type=bind,source=$(CURDIR)/layouts,target=/src/layouts,readonly \ + --mount type=bind,source=$(CURDIR)/static,target=/src/static,readonly \ + --mount type=tmpfs,destination=/tmp,tmpfs-mode=01777 \ + --mount type=bind,source=$(CURDIR)/hugo.yaml,target=/src/hugo.yaml,readonly + +# Fast NONBLOCKING IO to stdout caused by the hack/gen-content.sh script can +# cause Netlify builds to terminate unexpectedly. This forces stdout to block. BLOCK_STDOUT_CMD := python -c "import os,sys,fcntl; \ flags = fcntl.fcntl(sys.stdout, fcntl.F_GETFL); \ fcntl.fcntl(sys.stdout, fcntl.F_SETFL, flags&~os.O_NONBLOCK);" @@ -27,30 +39,32 @@ BLOCK_STDOUT_CMD := python -c "import os,sys,fcntl; \ .DEFAULT_GOAL := help .PHONY: targets container-targets -targets: help gen-content render serve clean clean-all sproduction preview-build +targets: help gen-content render server clean clean-all production-build preview-build container-targets: container-image container-gen-content container-render container-server help: ## Show this help text. @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' +dependencies: + npm ci + gen-content: ## Generates content from external sources. hack/gen-content.sh -render: ## Build the site using Hugo on the host. - git submodule update --init --recursive --depth 1 - hugo --verbose --ignoreCache --minify +render: dependencies ## Build the site using Hugo on the host. + hugo --logLevel info --ignoreCache --minify -server: ## Run Hugo locally (if Hugo "extended" is installed locally) - git submodule update --init --recursive --depth 1 +server: dependencies ## Run Hugo locally (if Hugo "extended" is installed locally) hugo server \ - --verbose \ + --logLevel info \ --buildDrafts \ --buildFuture \ --disableFastRender \ --ignoreCache -docker-image: container-image +docker-image: @echo -e "**** The use of docker-image is deprecated. Use container-image instead. ****" 1>&2 + $(MAKE) container-image container-image: ## Build container image for use with container-* targets. $(CONTAINER_ENGINE) build . -t $(CONTAINER_IMAGE) --build-arg HUGO_VERSION=$(HUGO_VERSION) @@ -67,8 +81,7 @@ docker-render: $(MAKE) container-render container-render: ## Build the site using Hugo within a container (equiv to render). - git submodule update --init --recursive --depth 1 - $(CONTAINER_RUN) $(CONTAINER_IMAGE) hugo --verbose --ignoreCache --minify + $(CONTAINER_RUN_TTY) $(CONTAINER_HUGO_MOUNTS) $(CONTAINER_IMAGE) hugo --logLevel info --ignoreCache --minify docker-server: @echo -e "**** The use of docker-server is deprecated. Use container-server instead. ****" 1>&2 @@ -76,10 +89,8 @@ docker-server: container-server: ## Run Hugo locally within a container, available at http://localhost:1313/ # no build lock to allow for read-only mounts - git submodule update --init --recursive --depth 1 - $(CONTAINER_RUN) -p 1313:1313 \ - --mount type=tmpfs,destination=/tmp,tmpfs-mode=01777 \ - --read-only \ + $(CONTAINER_RUN_TTY) -p 1313:1313 \ + $(CONTAINER_HUGO_MOUNTS) \ --cap-drop=ALL \ --cap-drop=AUDIT_WRITE \ $(CONTAINER_IMAGE) \ @@ -87,7 +98,7 @@ container-server: ## Run Hugo locally within a container, available at http://lo cd /tmp/src && \ hugo server \ --environment preview \ - --verbose \ + --logLevel info \ --noBuildLock \ --bind 0.0.0.0 \ --buildDrafts \ @@ -100,7 +111,7 @@ container-server: ## Run Hugo locally within a container, available at http://lo clean: ## Cleans build artifacts. rm -rf public/ resources/ _tmp/ -clean-all: ## Cleans both build artifacts and files sycned to content directory +clean-all: ## Cleans both build artifacts and files synced to content directory rm -rf public/ resources/ _tmp/ rm -f content/en/events/community-meeting.md rm -f content/en/events/meet-our-contributors.md @@ -129,21 +140,19 @@ clean-all: ## Cleans both build artifacts and files sycned to content directory production-build: ## Builds the production site (this command used only by Netlify). $(BLOCK_STDOUT_CMD) - git submodule update --init --recursive --depth 1 hack/gen-content.sh hugo \ --environment production \ - --verbose \ + --logLevel info \ --ignoreCache \ --minify preview-build: ## Builds a deploy preview of the site (this command used only by Netlify). $(BLOCK_STDOUT_CMD) - git submodule update --init --recursive --depth 1 hack/gen-content.sh hugo \ --environment preview \ - --verbose \ + --logLevel info \ --baseURL $(DEPLOY_PRIME_URL) \ --buildDrafts \ --buildFuture \ diff --git a/assets/scss/_variables.scss b/assets/scss/_variables.scss deleted file mode 100644 index 0a5990dbc..000000000 --- a/assets/scss/_variables.scss +++ /dev/null @@ -1,131 +0,0 @@ -/* - -Bootstrap variables overrides for theme. -See https://github.com/twbs/bootstrap/pull/23260 -*/ - -@fa-font-path : "../webfonts"; - -// Bootstrap flags. For more, see https://getbootstrap.com/docs/4.0/getting-started/theming/ -$enable-gradients: true; -$enable-rounded: true; -$enable-shadows: true; - -// Theme flags. - -$td-enable-google-fonts: true; - -// Theme colors - -$primary: #326CE5; -$primary-light: lighten($primary, 75%); -$secondary: #303030; -$success: #3772FF; -$info: #C0E0DE; -$warning: #ED6A5A; -$danger: #ED6A5A; -$white: #fff; -$light: #D3F3EE; - -$dark: #403F4C; -$blue: #72A1E5; -$orange: #BA5A31; -$gray-100: #f8f9fa; -$gray-200: #eee; -$gray-300: #dee2e6; -$gray-400: #ccc; -$gray-500: #adb5bd; -$gray-600: #888; -$gray-700: #495057; -$gray-800: #333; -$gray-900: #222; -$black: #000; - -$code-color: darken($secondary, 20%); - -// UI element colors - -$border-color: $gray-300; -$td-sidebar-bg-color: rgba($primary, 0.03); -$td-sidebar-border-color: $border-color; - -// Background colors for the sections on home page etc. It is a paint by number system, starting at 0, where the number is taken from the shortcode's ordinal -// if not provided by the user. -// These colors are all part of the theme palette, but the mix is fairly random to create variation. This can be overridden by the project if needed. -$td-box-colors: $dark, $primary, $secondary, $info, $primary-light, $gray-600, $success, $warning, $dark, $danger, $primary, $secondary, $primary-light, $info; - -$link-color: darken($blue, 15%); -$link-decoration: none; -$link-hover-color: darken($link-color, 15%); -$link-hover-decoration: none; - -// Fonts - -$google_font_name: "Open Sans"; -$google_font_family: "Open+Sans:300,300i,400,400i,700,700i"; -$web-font-path: "https://fonts.googleapis.com/css?family=#{$google_font_family}"; - -$td-fonts-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; - -@if $td-enable-google-fonts { - $td-fonts-serif: prepend($td-fonts-serif, "#{$google_font_name}"); -} - -$font-family-sans-serif: $td-fonts-serif; - -$font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; -$font-family-base: $font-family-sans-serif; -$font-size-base: 1rem; - -// Font weights - -$font-weight-light: 300; -$font-weight-normal: 400; -$font-weight-medium: 500; -$font-weight-bold: 700; - -$font-weight-body-text: $font-weight-normal; -$headings-font-weight: $font-weight-medium; - -// Heading sizes - -$h1-font-size: $font-size-base * 2.25; -$h2-font-size: $font-size-base * 2; -$h3-font-size: $font-size-base * 1.5; -$h4-font-size: $font-size-base * 1.35; -$h5-font-size: $font-size-base * 1.15; -$h6-font-size: $font-size-base; - -// Display styles - -$display1-weight: $font-weight-bold; -$display2-weight: $font-weight-bold; -$display3-weight: $font-weight-bold; -$display4-weight: $font-weight-bold; -$display1-size: 3rem; -$display2-size: 2.5rem; -$display3-size: 2rem; -$display4-size: 1.75rem; - -// Space - -$spacer: 1rem; -$td-block-space-top-base: 4 * $spacer; -$td-block-space-bottom-base: 4 * $spacer; - -// Pagination - -$pagination-color: $gray-600; -$pagination-border-color: rgba($black, 0.1); -$pagination-active-border-color: darken($primary, 5%); -$pagination-disabled-color: $gray-300; - -// Navbar - -$navbar-dark-color: rgba($white, 0.75); -$navbar-dark-hover-color: rgba($white, 0.5); -$navbar-dark-active-color: $white; -$navbar-dark-disabled-color: rgba($white, 0.25); - -// The yiq lightness value that determines when the lightness of color changes from "dark" to "light". -$yiq-contrasted-threshold: 200; diff --git a/assets/scss/_variables_project.scss b/assets/scss/_variables_project.scss new file mode 100644 index 000000000..29c168358 --- /dev/null +++ b/assets/scss/_variables_project.scss @@ -0,0 +1,2 @@ +$primary: #326ce5; +$secondary: #303030; diff --git a/hugo.yaml b/hugo.yaml index f2a49336d..8692e11c6 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -2,6 +2,7 @@ baseURL: 'https://www.kubernetes.dev/' title: Kubernetes Contributors theme: - docsy +themesDir: node_modules enableRobotsTXT: true enableGitInfo: false @@ -13,7 +14,6 @@ enableMissingTranslationPlaceholders: true disableKinds: - taxonomy - - taxonomyTerm # Highlighting config pygmentsCodeFences: true @@ -140,7 +140,7 @@ params: # The responses that the user sees after clicking "yes" (the page was helpful) or "no" (the page was not helpful). # yes = 'Glad to hear it! Please tell us how we can improve.' # no = 'Sorry to hear that. Please tell us how we can improve.' - + links: # End user relevant links. These will show up on left side of footer and in the community page if you have one. user: diff --git a/layouts/calendar/baseof.html b/layouts/calendar/baseof.html index 01ecf5fdd..6d57c62fe 100644 --- a/layouts/calendar/baseof.html +++ b/layouts/calendar/baseof.html @@ -1,5 +1,5 @@ - + {{ partial "head.html" . }} @@ -9,17 +9,22 @@ renderCalendar(); - +
{{ partial "navbar.html" . }}
-
+
-
+ + +
{{ partial "version-banner.html" . }} {{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }} {{ block "main" . }}{{ end }} diff --git a/layouts/calendar/list.html b/layouts/calendar/list.html index 23dba0c51..b59b8d004 100644 --- a/layouts/calendar/list.html +++ b/layouts/calendar/list.html @@ -1,10 +1,22 @@ {{ define "main" }}

{{ .Title }}

- {{ with .Params.description }}
{{ . | markdownify }}
{{ end }} - {{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) }} - {{ partial "reading-time.html" . }} - {{ end }} + {{ with .Params.description }}
{{ . | markdownify }}
{{ end }} +
+ {{ $context := . }} + {{ if .Site.Params.Taxonomy.taxonomyPageHeader }} + {{ range $index, $taxo := .Site.Params.Taxonomy.taxonomyPageHeader }} + {{ partial "taxonomy_terms_article.html" (dict "context" $context "taxo" $taxo ) }} + {{ end }} + {{ else }} + {{ range $taxo, $taxo_map := .Site.Taxonomies }} + {{ partial "taxonomy_terms_article.html" (dict "context" $context "taxo" $taxo ) }} + {{ end }} + {{ end }} + {{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) }} + {{ partial "reading-time.html" . }} + {{ end }} +
{{ .Content }} {{ partial "section-index.html" . }} {{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }} @@ -15,5 +27,6 @@

{{ .Title }}


{{ partial "disqus-comment.html" . }} {{ end }} + {{ partial "page-meta-lastmod.html" . }}
{{ end }} diff --git a/layouts/community/baseof.html b/layouts/community/baseof.html index 5df82a7e4..f46bf6df9 100644 --- a/layouts/community/baseof.html +++ b/layouts/community/baseof.html @@ -1,21 +1,23 @@ - + {{ partial "head.html" . }} - +
{{ partial "navbar.html" . }}
-
+
-
+ +
+ {{ partial "taxonomy_terms_clouds.html" . }} +
{{ partial "version-banner.html" . }} {{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }} @@ -27,4 +29,4 @@
{{ partial "scripts.html" . }} - \ No newline at end of file + diff --git a/layouts/community/list.html b/layouts/community/list.html index 23dba0c51..e2679fb2f 100644 --- a/layouts/community/list.html +++ b/layouts/community/list.html @@ -1,10 +1,13 @@ {{ define "main" }}

{{ .Title }}

- {{ with .Params.description }}
{{ . | markdownify }}
{{ end }} - {{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) }} - {{ partial "reading-time.html" . }} - {{ end }} + {{ with .Params.description }}
{{ . | markdownify }}
{{ end }} +
+ {{ partial "taxonomy_terms_article_wrapper.html" . }} + {{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) }} + {{ partial "reading-time.html" . }} + {{ end }} +
{{ .Content }} {{ partial "section-index.html" . }} {{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }} @@ -15,5 +18,6 @@

{{ .Title }}


{{ partial "disqus-comment.html" . }} {{ end }} + {{ partial "page-meta-lastmod.html" . }}
{{ end }} diff --git a/layouts/docs/baseof.html b/layouts/docs/baseof.html deleted file mode 100644 index 5df82a7e4..000000000 --- a/layouts/docs/baseof.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - {{ partial "head.html" . }} - - -
- {{ partial "navbar.html" . }} -
-
-
-
-
- {{ partial "sidebar.html" . }} -
-
- {{ partial "toc.html" . }} -
-
- {{ partial "version-banner.html" . }} - {{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }} - {{ block "main" . }}{{ end }} -
-
-
- {{ partial "footer.html" . }} -
- {{ partial "scripts.html" . }} - - \ No newline at end of file diff --git a/layouts/docs/list.html b/layouts/docs/list.html deleted file mode 100644 index 23dba0c51..000000000 --- a/layouts/docs/list.html +++ /dev/null @@ -1,19 +0,0 @@ -{{ define "main" }} -
-

{{ .Title }}

- {{ with .Params.description }}
{{ . | markdownify }}
{{ end }} - {{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) }} - {{ partial "reading-time.html" . }} - {{ end }} - {{ .Content }} - {{ partial "section-index.html" . }} - {{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }} - {{ partial "feedback.html" .Site.Params.ui.feedback }} -
- {{ end }} - {{ if (.Site.DisqusShortname) }} -
- {{ partial "disqus-comment.html" . }} - {{ end }} -
-{{ end }} diff --git a/layouts/docs/single.html b/layouts/docs/single.html deleted file mode 100644 index 00cb3ab91..000000000 --- a/layouts/docs/single.html +++ /dev/null @@ -1,3 +0,0 @@ -{{ define "main" }} -{{ .Render "content" }} -{{ end }} \ No newline at end of file diff --git a/layouts/events/baseof.html b/layouts/events/baseof.html deleted file mode 100644 index 5df82a7e4..000000000 --- a/layouts/events/baseof.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - {{ partial "head.html" . }} - - -
- {{ partial "navbar.html" . }} -
-
-
-
-
- {{ partial "sidebar.html" . }} -
-
- {{ partial "toc.html" . }} -
-
- {{ partial "version-banner.html" . }} - {{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }} - {{ block "main" . }}{{ end }} -
-
-
- {{ partial "footer.html" . }} -
- {{ partial "scripts.html" . }} - - \ No newline at end of file diff --git a/layouts/events/list.html b/layouts/events/list.html deleted file mode 100644 index 23dba0c51..000000000 --- a/layouts/events/list.html +++ /dev/null @@ -1,19 +0,0 @@ -{{ define "main" }} -
-

{{ .Title }}

- {{ with .Params.description }}
{{ . | markdownify }}
{{ end }} - {{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) }} - {{ partial "reading-time.html" . }} - {{ end }} - {{ .Content }} - {{ partial "section-index.html" . }} - {{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }} - {{ partial "feedback.html" .Site.Params.ui.feedback }} -
- {{ end }} - {{ if (.Site.DisqusShortname) }} -
- {{ partial "disqus-comment.html" . }} - {{ end }} -
-{{ end }} diff --git a/layouts/events/single.html b/layouts/events/single.html deleted file mode 100644 index 00cb3ab91..000000000 --- a/layouts/events/single.html +++ /dev/null @@ -1,3 +0,0 @@ -{{ define "main" }} -{{ .Render "content" }} -{{ end }} \ No newline at end of file diff --git a/layouts/partials/head.html b/layouts/partials/head.html deleted file mode 100644 index 6023b9640..000000000 --- a/layouts/partials/head.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - -{{ hugo.Generator }} -{{ if eq (getenv "HUGO_ENV") "production" }} - -{{ else }} - -{{ end }} -{{ range .AlternativeOutputFormats -}} - -{{ end -}} -{{ partialCached "favicons.html" . }} -{{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }} - -{{- template "_internal/opengraph.html" . -}} -{{- template "_internal/schema.html" . -}} -{{- template "_internal/twitter_cards.html" . -}} -{{ if eq (getenv "HUGO_ENV") "production" }} -{{ template "_internal/google_analytics_async.html" . }} -{{ end }} -{{ partialCached "head-css.html" . "asdf" }} - -{{ if .Site.Params.offlineSearch }} - -{{end}} -{{ partial "hooks/head-end.html" . }} diff --git a/layouts/partials/sidebar-tree.html b/layouts/partials/sidebar-tree.html deleted file mode 100644 index 4e3b387f7..000000000 --- a/layouts/partials/sidebar-tree.html +++ /dev/null @@ -1,59 +0,0 @@ - - -{{/* We cache this partial for bigger sites and set the active class client side. */}} -{{ $shouldDelayActive := ge (len .Site.Pages) 2000 }} -
- {{ if not .Site.Params.ui.sidebar_search_disable }} -
- {{ partial "search-input.html" . }} - -
- {{ else }} -
-
- {{ partial "search-input.html" . }} - -
-
-
- {{ end }} - -
-{{ define "section-tree-nav-section" }} -{{ $s := .section }} -{{ $p := .page }} -{{ $shouldDelayActive := .delayActive }} -{{ $active := eq $p.CurrentSection $s }} - -{{ $show := cond (or (and (not $p.Site.Params.ui.sidebar_menu_compact) ($p.IsAncestor $s)) ($p.IsDescendant $s) $active) true false }} -{{ $sid := $s.RelPermalink | anchorize }} -
    -
  • - {{ $s.LinkTitle }} -
    • -
      -
    • - {{ $pages := where (union $s.Pages $s.Sections).ByWeight ".Params.toc_hide" "!=" true }} - {{ $pages := $pages | first 50 }} - {{ range $pages }} - {{ if .IsPage }} - {{ $mid := printf "m-%s" (.RelPermalink | anchorize) }} - {{ $active := eq . $p }} - {{ .LinkTitle }} - {{ else }} - {{ template "section-tree-nav-section" (dict "page" $p "section" .) }} - {{ end }} - {{ end }} -
      • -
    -
-{{ end }} diff --git a/layouts/resources/baseof.html b/layouts/resources/baseof.html index 5df82a7e4..f46bf6df9 100644 --- a/layouts/resources/baseof.html +++ b/layouts/resources/baseof.html @@ -1,21 +1,23 @@ - + {{ partial "head.html" . }} - +
{{ partial "navbar.html" . }}
-
+
-
+ +
+ {{ partial "taxonomy_terms_clouds.html" . }} +
{{ partial "version-banner.html" . }} {{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }} @@ -27,4 +29,4 @@
{{ partial "scripts.html" . }} - \ No newline at end of file + diff --git a/layouts/resources/list.html b/layouts/resources/list.html index 23dba0c51..e2679fb2f 100644 --- a/layouts/resources/list.html +++ b/layouts/resources/list.html @@ -1,10 +1,13 @@ {{ define "main" }}

{{ .Title }}

- {{ with .Params.description }}
{{ . | markdownify }}
{{ end }} - {{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) }} - {{ partial "reading-time.html" . }} - {{ end }} + {{ with .Params.description }}
{{ . | markdownify }}
{{ end }} +
+ {{ partial "taxonomy_terms_article_wrapper.html" . }} + {{ if (and (not .Params.hide_readingtime) (.Site.Params.ui.readingtime.enable)) }} + {{ partial "reading-time.html" . }} + {{ end }} +
{{ .Content }} {{ partial "section-index.html" . }} {{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }} @@ -15,5 +18,6 @@

{{ .Title }}


{{ partial "disqus-comment.html" . }} {{ end }} + {{ partial "page-meta-lastmod.html" . }}
{{ end }} diff --git a/layouts/resources/single.html b/layouts/resources/single.html index 00cb3ab91..49bb662ad 100644 --- a/layouts/resources/single.html +++ b/layouts/resources/single.html @@ -1,3 +1,3 @@ {{ define "main" }} {{ .Render "content" }} -{{ end }} \ No newline at end of file +{{ end }} diff --git a/netlify.toml b/netlify.toml index 9d220e338..2f456b9ba 100644 --- a/netlify.toml +++ b/netlify.toml @@ -4,6 +4,7 @@ command = "make production-build" [build.environment] HUGO_VERSION = "0.124.0" +NODE_VERSION = "20.16.0" HUGO_ENV = "production" [context.deploy-preview] diff --git a/package-lock.json b/package-lock.json index 170188a4d..09d11208a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,12 +7,24 @@ "": { "name": "contributor-site", "version": "0.0.1", - "license": "ISC", + "license": "Apache-2.0", "devDependencies": { "autoprefixer": "^9.7.6", + "docsy": "github:google/docsy#semver:0.5.1", "postcss-cli": "^7.1.0" } }, + "node_modules/@fortawesome/fontawesome-free": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz", + "integrity": "sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ==", + "dev": true, + "hasInstallScript": true, + "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)", + "engines": { + "node": ">=6" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", @@ -175,6 +187,27 @@ "node": ">=8" } }, + "node_modules/bootstrap": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz", + "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/twbs" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + } + ], + "license": "MIT", + "peerDependencies": { + "jquery": "1.9.1 - 3", + "popper.js": "^1.16.1" + } + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -376,6 +409,15 @@ "node": ">=8" } }, + "node_modules/docsy": { + "version": "0.5.1", + "resolved": "git+ssh://git@github.com/google/docsy.git#f27daed90073fb74ca3afdc0250910abcfaa6bea", + "dev": true, + "dependencies": { + "@fortawesome/fontawesome-free": "6.2.0", + "bootstrap": "4.6.2" + } + }, "node_modules/electron-to-chromium": { "version": "1.3.412", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.412.tgz", @@ -716,6 +758,14 @@ "node": ">=0.12.0" } }, + "node_modules/jquery": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", + "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/js-yaml": { "version": "3.13.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", @@ -954,6 +1004,19 @@ "node": ">=4" } }, + "node_modules/popper.js": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", + "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", + "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1", + "dev": true, + "license": "MIT", + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/postcss": { "version": "7.0.27", "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", diff --git a/package.json b/package.json index 8a576a4f5..e986b4118 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,9 @@ "name": "contributor-site", "version": "0.0.1", "description": "Kubernetes Contributor Site", - "main": "none.js", - "dependencies": {}, "devDependencies": { "autoprefixer": "^9.7.6", + "docsy": "github:google/docsy#semver:0.5.1", "postcss-cli": "^7.1.0" }, "scripts": { @@ -15,8 +14,8 @@ "type": "git", "url": "git+https://github.com/kubernetes-sigs/contributor-site.git" }, - "author": "", - "license": "ISC", + "author": "The Kubernetes Authors", + "license": "Apache-2.0", "bugs": { "url": "https://github.com/kubernetes-sigs/contributor-site/issues" }, diff --git a/themes/docsy b/themes/docsy deleted file mode 160000 index 25f73360d..000000000 --- a/themes/docsy +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 25f73360dc4b72c7606531b37edace0417b40858