diff --git a/assets/icons/logo.svg b/assets/icons/logo.svg index 1adb67a..904159d 100644 --- a/assets/icons/logo.svg +++ b/assets/icons/logo.svg @@ -1 +1,27 @@ - \ No newline at end of file + + + + + + + + + + \ No newline at end of file diff --git a/assets/scss/_csp.scss b/assets/scss/_csp.scss index 419c53b..c542fc0 100644 --- a/assets/scss/_csp.scss +++ b/assets/scss/_csp.scss @@ -18,14 +18,14 @@ } } -// Homepage: it will need to be updated when the hero image is changed. +// Homepage: URLs below will need to be updated when the hero image changes. #td-cover-block-0 { - background-image: url(/featured-background_hu5459c0360c2b0cb7a147d2df0eb350ca_6445823_960x540_fill_q75_catmullrom_top.jpg); + background-image: url(/featured-background_hu16056391159218873026.jpg); } @media only screen and (min-width: 1200px) { #td-cover-block-0 { - background-image: url(/featured-background_hu5459c0360c2b0cb7a147d2df0eb350ca_6445823_1920x1080_fill_q75_catmullrom_top.jpg); + background-image: url(/featured-background_hu18408291696259244493.jpg); } } diff --git a/assets/scss/_external_link.scss b/assets/scss/_external_link.scss index d0e4dd6..921504c 100644 --- a/assets/scss/_external_link.scss +++ b/assets/scss/_external_link.scss @@ -1,3 +1,4 @@ +// Copied from https://github.com/open-telemetry/opentelemetry.io/blob/ddd8d43fff700effbe0047473071f9bab66ddb07/assets/scss/_external_link.scss // External-link icon after an external link // // To ensure that the external-link icon word-wraps along with the preceding diff --git a/assets/scss/_news.scss b/assets/scss/_news.scss index aa58fdc..487460b 100644 --- a/assets/scss/_news.scss +++ b/assets/scss/_news.scss @@ -13,7 +13,7 @@ .is-2 { flex: 0 0 16.67%; /* Equivalent to 2 out of 12 columns */ font-weight: bold; - color: #555; + color: var(--bs-tertiary-color); } .in-toto-column-content { diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss index dbd7925..e49a1cb 100644 --- a/assets/scss/_styles_project.scss +++ b/assets/scss/_styles_project.scss @@ -1,18 +1,10 @@ -@import 'external_link'; -@import 'td/code-dark'; @import 'csp'; @import 'news'; +@import 'external_link'; +@import 'td/code-dark'; -.td-navbar { - background-color: $primary !important; - opacity: 1; -} - -.td-navbar .navbar-brand { - svg { - height: 3rem; - margin-left: 5rem; - } +.td-navbar .navbar-brand svg { + height: 38px; } .td-home { @@ -38,6 +30,7 @@ a { color: white; + &.external-link:after { display: none; } diff --git a/assets/scss/_variables_project.scss b/assets/scss/_variables_project.scss index f5d1054..dba66d9 100644 --- a/assets/scss/_variables_project.scss +++ b/assets/scss/_variables_project.scss @@ -5,6 +5,4 @@ $in-toto-colors: ( 'blue-light': #a3b5c8, ); -$primary: map-get($in-toto-colors, 'blue'); $secondary: map-get($in-toto-colors, 'orange'); -$td-enable-google-fonts: false; diff --git a/content/en/featured-background.jpg b/content/en/featured-background.jpg index b04f1f6..b1d3cac 100644 Binary files a/content/en/featured-background.jpg and b/content/en/featured-background.jpg differ diff --git a/hugo.yaml b/hugo.yaml index 5624d1e..9206a8e 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -1,12 +1,15 @@ baseURL: https://in-toto.io title: in-toto -disableAliases: true # We do redirects via Netlify's _redirects file disableKinds: [taxonomy] +theme: [docsy] enableGitInfo: true -enableRobotsTXT: true -theme: [docsy] +# +# Outputs and Netlify _redirects file support +# + +disableAliases: true # We do redirects via Netlify's _redirects file outputs: home: [HTML] diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html new file mode 100644 index 0000000..aaa3eab --- /dev/null +++ b/layouts/_default/_markup/render-link.html @@ -0,0 +1,37 @@ +{{/* Source: https://github.com/open-telemetry/opentelemetry.io/blob/ddd8d43fff700effbe0047473071f9bab66ddb07/layouts/_default/_markup/render-link.html */ -}} + +{{ $url := .Destination -}} + +{{/* General link-render processing */ -}} + +{{ $isExternal := hasPrefix $url "http" -}} +{{ if $isExternal -}} + {{ if findRE "^https://opentelemetry.io/\\w" $url -}} + {{ warnf "%s: use a local path, not an external URL, for the following reference to a site local page: %s" + .Page.File.Path $url -}} + {{ else if or + (findRE "^https://github.com/open-telemetry/opentelemetry-specification/(blob|tree)/main/specification/\\w" $url) + (findRE "^https://github.com/open-telemetry/opentelemetry-proto/(blob|tree)/main/docs/specification" $url) + (findRE "^https://github.com/open-telemetry/semantic-conventions/(blob|tree)/main/docs" $url) + -}} + {{ warnf "%s: use a local path, not an external URL, for the following reference to a local specification page: %s" + .Page.File.Path $url -}} + {{ end -}} +{{ end -}} + +{{/* Until Hugo supports hook params (https://github.com/gohugoio/hugo/issues/6670), we'll inspect .Text. */ -}} + + + {{- .Text | safeHTML -}} + + +{{- /* + cSpell:ignore warnf + This comment ensures that all trailing whitespace is trimmed. +*/ -}} diff --git a/netlify.toml b/netlify.toml index bedb3ab..2adb806 100644 --- a/netlify.toml +++ b/netlify.toml @@ -10,4 +10,4 @@ command = "npm run build:production" [headers.values] X-Content-Type-Options = "nosniff" X-Frame-Options = "DENY" - Content-Security-Policy = "default-src 'self' code.jquery.com fonts.googleapis.com fonts.gstatic.com use.fontawesome.com" + Content-Security-Policy = "default-src 'self' code.jquery.com fonts.googleapis.com fonts.gstatic.com cse.google.com www.google.com use.fontawesome.com app.netlify.com netlify-cdp-loader.netlify.app youtube.com; frame-src youtube.com www.youtube.com" diff --git a/package.json b/package.json index 6692d8e..f8e66c5 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "_hugo": "hugo --cleanDestinationDir", "_ls-bad-filenames": "find assets content -name '*_*' ! -name '[_.]*'", "_prepare:docsy": "cd themes/docsy && npm install", - "_serve": "npm run _hugo-dev -- --minify serve", + "_serve": "npm run _hugo-dev -- serve --minify --disableFastRender --renderToMemory", "build:preview": "npm run _hugo-dev -- --minify --baseURL \"${DEPLOY_PRIME_URL:-http://localhost}\"", "build:production": "npm run _hugo -- --minify", "build": "npm run _build --", diff --git a/static/img/in-toto-horizontal-white.svg b/static/img/in-toto-horizontal-white.svg index f0ea4e7..aa6310f 100644 --- a/static/img/in-toto-horizontal-white.svg +++ b/static/img/in-toto-horizontal-white.svg @@ -6,12 +6,12 @@ } - -