You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2026/03/24 05:43:17 UTC
(skywalking-website) branch bump-hugo-and-ui-improvements created (now 0f21164a03a)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch bump-hugo-and-ui-improvements
in repository https://gitbox.apache.org/repos/asf/skywalking-website.git
at 0f21164a03a Bump Hugo to v0.159.0 and improve UI
This branch includes the following new commits:
new 0f21164a03a Bump Hugo to v0.159.0 and improve UI
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(skywalking-website) 01/01: Bump Hugo to v0.159.0 and improve UI
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch bump-hugo-and-ui-improvements
in repository https://gitbox.apache.org/repos/asf/skywalking-website.git
commit 0f21164a03a4ffc062556be985c323d8daabdf82
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Mar 24 13:42:35 2026 +0800
Bump Hugo to v0.159.0 and improve UI
- Bump Hugo from v0.80.0 to v0.159.0 in CI and add netlify.toml
- Fix deprecated APIs: .Site.IsServer, .Site.DisqusShortname,
.Site.Author, .Site.Data, .Scratch
- Fix duplicate description key in skywalkingday-2021 event
- Derive doc localPath from link field, allowing version names
with special characters like parentheses
- Fix skywalking-python v1.2.0 link pointing to /next/
- Right-align version selector in doc sidebar, prevent overflow
- Restyle download links: highlight main downloads, dim asc/sha512
- Add hover effect on docs dropdown items
---
.github/workflows/deploy.yaml | 4 +-
assets/scss/_custom_docs.scss | 46 ++++++++++++++++++++++-
content/events/skywalkingday-2021/index.md | 3 +-
docs.js | 8 ++--
layouts/shortcodes/contributors-home.html | 2 +-
layouts/shortcodes/contributors-search.html | 2 +-
layouts/shortcodes/contributors.html | 4 +-
layouts/shortcodes/downloads-block.html | 32 ++++++++++------
layouts/shortcodes/home-banner.html | 6 +--
layouts/shortcodes/users.html | 2 +-
netlify.toml | 6 +++
themes/docsy/assets/scss/_custom_project_doc.scss | 12 ++++--
themes/docsy/assets/scss/_styles_project.scss | 12 +++++-
themes/docsy/layouts/_default/content.html | 2 +-
themes/docsy/layouts/_default/list.rss.xml | 13 +++----
themes/docsy/layouts/blog/content.html | 2 +-
themes/docsy/layouts/docs/baseof.html | 4 +-
themes/docsy/layouts/docs/list.html | 2 +-
themes/docsy/layouts/downloads/content.html | 2 +-
themes/docsy/layouts/events/content.html | 2 +-
themes/docsy/layouts/partials/active-scripts.html | 2 +-
themes/docsy/layouts/partials/disqus-comment.html | 2 +-
themes/docsy/layouts/partials/head-css.html | 2 +-
themes/docsy/layouts/partials/scripts.html | 2 +-
themes/docsy/layouts/swagger/list.html | 2 +-
themes/docsy/layouts/zh/content.html | 2 +-
26 files changed, 125 insertions(+), 53 deletions(-)
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index b5269ffb9bb..75f561ea570 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -35,8 +35,8 @@ jobs:
- name: Install
run: |
- wget https://github.com/gohugoio/hugo/releases/download/v0.80.0/hugo_extended_0.80.0_Linux-64bit.tar.gz
- tar xvf hugo_extended_0.80.0_Linux-64bit.tar.gz
+ wget https://github.com/gohugoio/hugo/releases/download/v0.159.0/hugo_extended_0.159.0_linux-amd64.tar.gz
+ tar xvf hugo_extended_0.159.0_linux-amd64.tar.gz
sudo mv hugo /usr/bin/
- name: Build
diff --git a/assets/scss/_custom_docs.scss b/assets/scss/_custom_docs.scss
index 06808cdf50b..5ca8fe9c7f8 100644
--- a/assets/scss/_custom_docs.scss
+++ b/assets/scss/_custom_docs.scss
@@ -242,9 +242,53 @@
.dropdown-menu {
min-width: 6rem;
- width: 100%;
max-height: 208px;
overflow-y: auto;
+
+ .dropdown-item {
+ white-space: nowrap;
+ &:hover {
+ background-color: #f0f0f0;
+ }
+ }
+ }
+ }
+
+ .download-links {
+ display: flex;
+ align-items: center;
+ gap: 6px;
+ flex-wrap: wrap;
+
+ .dl-break {
+ flex-basis: 100%;
+ height: 0;
+ }
+
+ .dl-main {
+ background-color: #2B74B8;
+ color: #fff;
+ padding: 2px 10px;
+ border-radius: 3px;
+ font-size: 13px;
+ text-decoration: none;
+ &:hover {
+ background-color: #1e5a94;
+ color: #fff;
+ }
+ }
+
+ .dl-aux {
+ color: #888;
+ font-size: 12px;
+ text-decoration: none;
+ border: 1px solid #ddd;
+ padding: 1px 6px;
+ border-radius: 3px;
+ &:hover {
+ color: #555;
+ border-color: #bbb;
+ }
}
}
diff --git a/content/events/skywalkingday-2021/index.md b/content/events/skywalkingday-2021/index.md
index 64769ce3268..602c70aab9d 100644
--- a/content/events/skywalkingday-2021/index.md
+++ b/content/events/skywalkingday-2021/index.md
@@ -2,8 +2,7 @@
title: "SkyWalkingDay Conference 2021, relocating at Beijing"
date: 2021-06-07
author: SkyWalking Team
-description: Considering recent COVID19 status of Shenzhen, we have cancelled the Shenzhen event, and NOW we hold it at Beijing.
-description: Apache SkyWalking hosts SkyWalkingDay Conference 2021 in June 26th, jointly with Tencent and Tetrate.
+description: Apache SkyWalking hosts SkyWalkingDay Conference 2021 in June 26th, jointly with Tencent and Tetrate. Considering recent COVID19 status of Shenzhen, we have cancelled the Shenzhen event, and NOW we hold it at Beijing.
endTime: 2021-06-20T10:00:00Z
poster: /events/skywalkingday-2021/skywalkingday.png
---
diff --git a/docs.js b/docs.js
index 137befb1435..f8495e82a79 100644
--- a/docs.js
+++ b/docs.js
@@ -163,10 +163,10 @@ async function traverseDocsList(result) {
</h5>
<p>${description}</p>
</div>
- {{ $currentVersion := lower .Site.Data.docSidebar.${menuFileName}.version }}
+ {{ $currentVersion := lower site.Data.docSidebar.${menuFileName}.version }}
<div class="version-wrapper">Version:
<select class="version-select">
- {{range .Site.Data.docSidebar.${menuFileName}.repoDocs}}
+ {{range site.Data.docSidebar.${menuFileName}.repoDocs}}
{{$version := lower .version}}
{{$versionName := .versionName}}
<option {{ cond (eq $currentVersion $version) "selected" "" }} value="{{$version}}">
@@ -180,8 +180,8 @@ async function traverseDocsList(result) {
</select>
</div>
- {{ partial "sidebar-menu.html" .Site.Data.docSidebar.${menuFileName} }}
- <div class="commit-id">Commit Id: {{.Site.Data.docSidebar.${menuFileName}.commitId}}</div>
+ {{ partial "sidebar-menu.html" site.Data.docSidebar.${menuFileName} }}
+ <div class="commit-id">Commit Id: {{site.Data.docSidebar.${menuFileName}.commitId}}</div>
{{ end }}\n`;
execSync(`"./doc.sh" "${repo}" "${repoUrl}" "${commitId}" "${localPath}" "${menuFileName}"`);
diff --git a/layouts/shortcodes/contributors-home.html b/layouts/shortcodes/contributors-home.html
index 3f486626824..a79049548cd 100644
--- a/layouts/shortcodes/contributors-home.html
+++ b/layouts/shortcodes/contributors-home.html
@@ -1,5 +1,5 @@
<a class="community-box" href="/team">
<span class="community mr-10">COMMUNITY</span>
- <span class="mr-10">SkyWalking has received contributions from <em class="count">{{ .Site.Data.team.totalCount }}</em> individuals now.</span>
+ <span class="mr-10">SkyWalking has received contributions from <em class="count">{{ site.Data.team.totalCount }}</em> individuals now.</span>
<i class="iconfont icon-arrow-right pull-right"></i>
</a>
diff --git a/layouts/shortcodes/contributors-search.html b/layouts/shortcodes/contributors-search.html
index 89008e6a2d8..c9730ba0689 100644
--- a/layouts/shortcodes/contributors-search.html
+++ b/layouts/shortcodes/contributors-search.html
@@ -10,7 +10,7 @@
<div class="title">Ranking</div>
</div>
<div class="contributors-wrapper">
- {{range .Site.Data.team.projects}}
+ {{range site.Data.team.projects}}
{{range $index, $element := .list}}
{{$name := .name }}
{{$id := .repo }}
diff --git a/layouts/shortcodes/contributors.html b/layouts/shortcodes/contributors.html
index afcf17737c6..c7bc610b0b0 100644
--- a/layouts/shortcodes/contributors.html
+++ b/layouts/shortcodes/contributors.html
@@ -1,7 +1,7 @@
<div class="pt-4">
<h2 id="contributors">
Contributors
- <span class="total">{{.Site.Data.team.totalCount }}</span>
+ <span class="total">{{site.Data.team.totalCount }}</span>
</h2>
<div class="input-group input-group-sm team-input-group">
<input type="text" id="team-contributor-input" class="form-control" placeholder="Search GitHub name" aria-label="Search">
@@ -10,7 +10,7 @@
</div>
</div>
<div class="contributors-wrapper">
- {{ range .Site.Data.team.projects }}
+ {{ range site.Data.team.projects }}
<div class="item-wrapper">
{{range $index, $element := .list}}
diff --git a/layouts/shortcodes/downloads-block.html b/layouts/shortcodes/downloads-block.html
index a422c507584..e7ccd6f3b29 100755
--- a/layouts/shortcodes/downloads-block.html
+++ b/layouts/shortcodes/downloads-block.html
@@ -6,7 +6,7 @@
for end user convenience.
</p>
<div class="text-center btn-wrapper mb-4">
- {{range .Site.Data.releases}}
+ {{range site.Data.releases}}
{{if .buttonText}}
<a href="#{{.buttonText}}" class="link-type">
<button class="sky-btn">{{.buttonText}}</button>
@@ -24,7 +24,7 @@
</div>
- {{ range .Site.Data.releases }}
+ {{ range site.Data.releases }}
<div class="card-wrapper">
{{if .buttonText}}
<h2 class="deco-title" id="{{.buttonText}}">{{.type}}</h2>
@@ -66,11 +66,16 @@
{{ range .source }}
<h6 class="dropdown-header">{{.version}}<span> | {{.date}}</span></h6>
{{ $version := .version }}
- <div class="dropdown-item">
+ <div class="dropdown-item download-links">
{{range .downloadLink}}
- {{ if eq .name "|" }}<br>{{ else }}
- [<a href="{{.link}}" data-label="[{{$name}}]-[Source]-[{{$version}}]-[{{.name}}]"
- rel="noopener noreferrer" target="_blank">{{.name}}</a>]
+ {{ if eq .name "|" }}<div class="dl-break"></div>{{ else }}
+ {{ if or (eq .name "asc") (eq .name "sha512") }}
+ <a class="dl-aux" href="{{.link}}" data-label="[{{$name}}]-[Source]-[{{$version}}]-[{{.name}}]"
+ rel="noopener noreferrer" target="_blank" title="{{.name}}">{{.name}}</a>
+ {{ else }}
+ <a class="dl-main" href="{{.link}}" data-label="[{{$name}}]-[Source]-[{{$version}}]-[{{.name}}]"
+ rel="noopener noreferrer" target="_blank">{{.name}}</a>
+ {{ end }}
{{ end }}
{{end}}
</div>
@@ -92,11 +97,16 @@
{{ range .distribution }}
<h6 class="dropdown-header">{{.version}}<span> | {{.date}}</span></h6>
{{ $version := .version }}
- <div class="dropdown-item">
+ <div class="dropdown-item download-links">
{{range .downloadLink}}
- {{ if eq .name "|" }}<br>{{ else }}
- [<a href="{{.link}}" data-label="[{{$name}}]-[Distribution]-[{{$version}}]-[{{.name}}]"
- rel="noopener noreferrer" target="_blank">{{.name}}</a>]
+ {{ if eq .name "|" }}<div class="dl-break"></div>{{ else }}
+ {{ if or (eq .name "asc") (eq .name "sha512") }}
+ <a class="dl-aux" href="{{.link}}" data-label="[{{$name}}]-[Distribution]-[{{$version}}]-[{{.name}}]"
+ rel="noopener noreferrer" target="_blank" title="{{.name}}">{{.name}}</a>
+ {{ else }}
+ <a class="dl-main" href="{{.link}}" data-label="[{{$name}}]-[Distribution]-[{{$version}}]-[{{.name}}]"
+ rel="noopener noreferrer" target="_blank">{{.name}}</a>
+ {{ end }}
{{ end }}
{{end}}
</div>
@@ -133,7 +143,7 @@
<div class="card-wrapper images-wrapper">
<h2 class="deco-title" id="DockerImages">Docker Images for convenience</h2>
<div class="item-wrapper">
- {{ range .Site.Data.dockerImages }}
+ {{ range site.Data.dockerImages }}
{{$imgId := replace .name " " "" }}
<div class="card item">
<div class="card-body">
diff --git a/layouts/shortcodes/home-banner.html b/layouts/shortcodes/home-banner.html
index 902e19d3e4e..1abd777376d 100644
--- a/layouts/shortcodes/home-banner.html
+++ b/layouts/shortcodes/home-banner.html
@@ -1,7 +1,7 @@
<!--< home-banner >-->
<div class="accordion" id="uiMobileContainer">
- {{range .Site.Data.index}}
+ {{range site.Data.index}}
{{range $index, $element := .list}}
{{$target := replace .name " " "" }}
<div class="card">
@@ -38,7 +38,7 @@
<div class="container ui-container">
<div class="banner-content-inner">
<div class="banner-wrapper">
- {{range .Site.Data.index}}
+ {{range site.Data.index}}
{{range .list}}
<img class="img-item" loading="lazy" src="{{.img}}" alt="{{.name}}">
{{end}}
@@ -46,7 +46,7 @@
</div>
</div>
<ul class="banner-nav">
- {{range .Site.Data.index}}
+ {{range site.Data.index}}
{{range $index, $element := .list}}
<li
{{if eq $index 0}}
diff --git a/layouts/shortcodes/users.html b/layouts/shortcodes/users.html
index aa86dafaa16..b83b4093b3d 100644
--- a/layouts/shortcodes/users.html
+++ b/layouts/shortcodes/users.html
@@ -5,7 +5,7 @@
Various companies and organizations use SkyWalking for research, production and commercial products.
</p>
<div class="img-wrapper">
- {{ range .Site.Data.users.users }}
+ {{ range site.Data.users.users }}
<a class="link" href="{{.website}}" rel="noopener noreferrer" target="_blank">
<img data-src="{{.logo}}" data-nolightbox="true">
</a>
diff --git a/netlify.toml b/netlify.toml
new file mode 100644
index 00000000000..8080af9a708
--- /dev/null
+++ b/netlify.toml
@@ -0,0 +1,6 @@
+[build]
+ command = "npm run build-preview"
+ publish = "public"
+
+[build.environment]
+ HUGO_VERSION = "0.159.0"
diff --git a/themes/docsy/assets/scss/_custom_project_doc.scss b/themes/docsy/assets/scss/_custom_project_doc.scss
index 5ad9482055e..b0960282b57 100644
--- a/themes/docsy/assets/scss/_custom_project_doc.scss
+++ b/themes/docsy/assets/scss/_custom_project_doc.scss
@@ -23,12 +23,13 @@
}
}
.version-select{
- vertical-align: middle;
margin-left: 5px;
color: #2c3e50;
border: 1px solid #dee2e6;
border-radius: 2px;
outline: none;
+ text-align: left;
+ max-width: calc(100% - 65px);
}
.td-sidebar {
@@ -39,6 +40,7 @@
height: 100vh;
overflow-y: scroll;
overflow-y: overlay;
+ overflow-x: hidden;
position: sticky;
position: -webkit-sticky;
top: 0px;
@@ -53,15 +55,19 @@
}
.version-wrapper {
- padding-top: 10px;
+ padding: 10px 11px 0 8px;
font-weight: 400;
font-size: 16px;
- text-indent: 8px;
line-height: 1.5;
margin-top: 0;
margin-bottom: 0.5rem;
font-family: inherit;
color: inherit;
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ white-space: nowrap;
+ overflow: hidden;
}
}
diff --git a/themes/docsy/assets/scss/_styles_project.scss b/themes/docsy/assets/scss/_styles_project.scss
index 9fd338ed88a..e8b9b5a6202 100644
--- a/themes/docsy/assets/scss/_styles_project.scss
+++ b/themes/docsy/assets/scss/_styles_project.scss
@@ -173,11 +173,21 @@ table {
}
.scroll-bar {
+ scrollbar-width: thin;
+ scrollbar-color: #999 #f0f0f0;
&::-webkit-scrollbar {
width: 5px;
+ height: 5px;
+ -webkit-appearance: none;
+ }
+ &::-webkit-scrollbar-track {
+ background-color: #f0f0f0;
}
&::-webkit-scrollbar-thumb {
- background-color: #bebebe !important;
+ background-color: #999 !important;
border-radius: 2px;
+ &:hover {
+ background-color: #666 !important;
+ }
}
}
diff --git a/themes/docsy/layouts/_default/content.html b/themes/docsy/layouts/_default/content.html
index b574ad29c32..84ae93399ed 100644
--- a/themes/docsy/layouts/_default/content.html
+++ b/themes/docsy/layouts/_default/content.html
@@ -6,7 +6,7 @@
{{ partial "feedback.html" .Site.Params.ui.feedback }}
<br />
{{ end }}
- {{ if (.Site.DisqusShortname) }}
+ {{ if (.Site.Config.Services.Disqus.Shortname) }}
<br />
{{ partial "disqus-comment.html" . }}
{{ end }}
diff --git a/themes/docsy/layouts/_default/list.rss.xml b/themes/docsy/layouts/_default/list.rss.xml
index b74bc357941..86be665947c 100644
--- a/themes/docsy/layouts/_default/list.rss.xml
+++ b/themes/docsy/layouts/_default/list.rss.xml
@@ -4,9 +4,7 @@
<link>{{ .Permalink }}</link>
<description>Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}</description>
<generator>Hugo -- gohugo.io</generator>{{ with .Site.LanguageCode }}
- <language>{{.}}</language>{{end}}{{ with .Site.Author.email }}
- <managingEditor>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Author.email }}
- <webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }}
+ <language>{{.}}</language>{{end}}{{ with .Site.Copyright }}
<copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }}
<lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
{{ with .OutputFormats.Get "RSS" }}
@@ -14,20 +12,19 @@
{{ end }}
{{ if not $.Section }}
{{ $sections := .Site.Params.rss_sections | default (slice "blog") }}
- {{ .Scratch.Set "rss_pages" (first 50 (where $.Site.RegularPages "Type" "in" $sections )) }}
+ {{ .Store.Set "rss_pages" (first 50 (where $.Site.RegularPages "Type" "in" $sections )) }}
{{ else }}
{{ if $.Parent.IsHome }}
- {{ .Scratch.Set "rss_pages" (first 50 (where $.Site.RegularPages "Type" $.Section )) }}
+ {{ .Store.Set "rss_pages" (first 50 (where $.Site.RegularPages "Type" $.Section )) }}
{{ else }}
- {{ .Scratch.Set "rss_pages" (first 50 $.Pages) }}
+ {{ .Store.Set "rss_pages" (first 50 $.Pages) }}
{{ end }}
{{ end }}
- {{ range (.Scratch.Get "rss_pages") }}
+ {{ range (.Store.Get "rss_pages") }}
<item>
<title>{{ .Section | title }}: {{ .Title }}</title>
<link>{{ .Permalink }}</link>
<pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
- {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
<guid>{{ .Permalink }}</guid>
<description>
{{ $img := (.Resources.ByType "image").GetMatch "*featured*" }}
diff --git a/themes/docsy/layouts/blog/content.html b/themes/docsy/layouts/blog/content.html
index 85903579ab6..7c40a1869e6 100644
--- a/themes/docsy/layouts/blog/content.html
+++ b/themes/docsy/layouts/blog/content.html
@@ -18,7 +18,7 @@
</div>
{{ .Content }}
- {{ if (.Site.DisqusShortname) }}
+ {{ if (.Site.Config.Services.Disqus.Shortname) }}
<br />
{{ partial "disqus-comment.html" . }}
<br />
diff --git a/themes/docsy/layouts/docs/baseof.html b/themes/docsy/layouts/docs/baseof.html
index 2f630bcc10a..10e2c5b2423 100644
--- a/themes/docsy/layouts/docs/baseof.html
+++ b/themes/docsy/layouts/docs/baseof.html
@@ -21,7 +21,7 @@
If you want to deploy a feature preview directly, you can follow the <a href="#SkyWalkingShowcase">showcase documentation</a> for a quick deployment.
</p>
<div class="text-center btn-wrapper mb-4">
- {{range .Site.Data.docs}}
+ {{range site.Data.docs}}
{{if .buttonText}}
<a href="#{{.buttonText}}" class="link-type">
<button class="sky-btn">{{.buttonText}}</button>
@@ -35,7 +35,7 @@
{{end}}
</div>
- {{range .Site.Data.docs}}
+ {{range site.Data.docs}}
<div class="card-wrapper">
{{if .buttonText}}
<h2 class="deco-title" id="{{.buttonText}}">{{.type}}</h2>
diff --git a/themes/docsy/layouts/docs/list.html b/themes/docsy/layouts/docs/list.html
index 712247801a0..908403af9f9 100644
--- a/themes/docsy/layouts/docs/list.html
+++ b/themes/docsy/layouts/docs/list.html
@@ -8,7 +8,7 @@
{{ partial "feedback.html" .Site.Params.ui.feedback }}
<br />
{{ end }}
- {{ if (.Site.DisqusShortname) }}
+ {{ if (.Site.Config.Services.Disqus.Shortname) }}
<br />
{{ partial "disqus-comment.html" . }}
{{ end }}
diff --git a/themes/docsy/layouts/downloads/content.html b/themes/docsy/layouts/downloads/content.html
index b574ad29c32..84ae93399ed 100644
--- a/themes/docsy/layouts/downloads/content.html
+++ b/themes/docsy/layouts/downloads/content.html
@@ -6,7 +6,7 @@
{{ partial "feedback.html" .Site.Params.ui.feedback }}
<br />
{{ end }}
- {{ if (.Site.DisqusShortname) }}
+ {{ if (.Site.Config.Services.Disqus.Shortname) }}
<br />
{{ partial "disqus-comment.html" . }}
{{ end }}
diff --git a/themes/docsy/layouts/events/content.html b/themes/docsy/layouts/events/content.html
index 7193b191d7b..dae7acc98c6 100644
--- a/themes/docsy/layouts/events/content.html
+++ b/themes/docsy/layouts/events/content.html
@@ -6,7 +6,7 @@
<time datetime="{{ $.Date.Format "2006-01-02" }}" class="text-muted">{{ $.Date.Format $.Site.Params.time_format_blog }}</time>
</div>
{{ .Content }}
- {{ if (.Site.DisqusShortname) }}
+ {{ if (.Site.Config.Services.Disqus.Shortname) }}
<br />
{{ partial "disqus-comment.html" . }}
<br />
diff --git a/themes/docsy/layouts/partials/active-scripts.html b/themes/docsy/layouts/partials/active-scripts.html
index a1b16f05a3b..ba7c3b1a31e 100644
--- a/themes/docsy/layouts/partials/active-scripts.html
+++ b/themes/docsy/layouts/partials/active-scripts.html
@@ -1,6 +1,6 @@
{{ $jsActive := resources.Get "js/active.js" }}
{{ $js := (slice $jsActive) | resources.Concat "js/active.js" }}
-{{ if .Site.IsServer }}
+{{ if hugo.IsServer }}
<script src="{{ $js.RelPermalink }}"></script>
{{ else }}
{{ $js := $js | minify | fingerprint }}
diff --git a/themes/docsy/layouts/partials/disqus-comment.html b/themes/docsy/layouts/partials/disqus-comment.html
index c3ae3f91b3b..f7406c48482 100644
--- a/themes/docsy/layouts/partials/disqus-comment.html
+++ b/themes/docsy/layouts/partials/disqus-comment.html
@@ -14,7 +14,7 @@ this.page.identifier = PAGE_IDENTIFIER; // Replace PAGE_IDENTIFIER with your pag
*/
(function() { // DON'T EDIT BELOW THIS LINE
var d = document, s = d.createElement('script');
-s.src = 'https://' + {{ .Site.DisqusShortname }} + '.disqus.com/embed.js';
+s.src = 'https://' + {{ .Site.Config.Services.Disqus.Shortname }} + '.disqus.com/embed.js';
s.setAttribute('data-timestamp', +new Date());
(d.head || d.body).appendChild(s);
})();
diff --git a/themes/docsy/layouts/partials/head-css.html b/themes/docsy/layouts/partials/head-css.html
index 86952b18395..0d2cae5ae76 100644
--- a/themes/docsy/layouts/partials/head-css.html
+++ b/themes/docsy/layouts/partials/head-css.html
@@ -1,5 +1,5 @@
{{ $scssMain := "scss/main.scss"}}
-{{ if .Site.IsServer }}
+{{ if hugo.IsServer }}
{{/* Note the missing postCSS. This makes it snappier to develop in Chrome, but makes it look sub-optimal in other browsers. */}}
{{ $css := resources.Get $scssMain | toCSS (dict "enableSourceMap" true) }}
<link href="{{ $css.RelPermalink }}" rel="stylesheet">
diff --git a/themes/docsy/layouts/partials/scripts.html b/themes/docsy/layouts/partials/scripts.html
index 77a58c48c82..c043dee4988 100644
--- a/themes/docsy/layouts/partials/scripts.html
+++ b/themes/docsy/layouts/partials/scripts.html
@@ -8,7 +8,7 @@
{{ $algolia := resources.Get "js/algolia-search.js" }}
{{ $event := resources.Get "js/event-popup.js" }}
{{ $js := (slice $jsAnchor $jsLightbox $jsSlider $algolia $event) | resources.Concat "js/main.js" }}
-{{ if .Site.IsServer }}
+{{ if hugo.IsServer }}
<script src="{{ $js.RelPermalink }}"></script>
{{ else }}
{{ $js := $js | minify | fingerprint }}
diff --git a/themes/docsy/layouts/swagger/list.html b/themes/docsy/layouts/swagger/list.html
index 712247801a0..908403af9f9 100644
--- a/themes/docsy/layouts/swagger/list.html
+++ b/themes/docsy/layouts/swagger/list.html
@@ -8,7 +8,7 @@
{{ partial "feedback.html" .Site.Params.ui.feedback }}
<br />
{{ end }}
- {{ if (.Site.DisqusShortname) }}
+ {{ if (.Site.Config.Services.Disqus.Shortname) }}
<br />
{{ partial "disqus-comment.html" . }}
{{ end }}
diff --git a/themes/docsy/layouts/zh/content.html b/themes/docsy/layouts/zh/content.html
index 674afa1c06d..82f747bc0f0 100644
--- a/themes/docsy/layouts/zh/content.html
+++ b/themes/docsy/layouts/zh/content.html
@@ -16,7 +16,7 @@
</div>
{{ .Content }}
- {{ if (.Site.DisqusShortname) }}
+ {{ if (.Site.Config.Services.Disqus.Shortname) }}
<br />
{{ partial "disqus-comment.html" . }}
<br />