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 2021/04/21 15:15:28 UTC
[skywalking-website] branch master updated: Upgraded dependence
libs and fine-tuning (#257)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-website.git
The following commit(s) were added to refs/heads/master by this push:
new 7b9b125 Upgraded dependence libs and fine-tuning (#257)
7b9b125 is described below
commit 7b9b1256760a4b7dac02390456a56ef00b64969d
Author: Juntao Zhang <jt...@163.com>
AuthorDate: Wed Apr 21 23:15:18 2021 +0800
Upgraded dependence libs and fine-tuning (#257)
---
content/_index.html | 19 +++++++++----------
layouts/shortcodes/downloads-block.html | 4 ++--
static/screenshots/8.4.0/alarm.jpg | Bin 240074 -> 144342 bytes
static/screenshots/8.4.0/dashboard_01.jpg | Bin 376448 -> 242394 bytes
static/screenshots/8.4.0/dashboard_02.jpg | Bin 249284 -> 152205 bytes
static/screenshots/8.4.0/dashboard_03.jpg | Bin 332562 -> 213974 bytes
static/screenshots/8.4.0/log.jpg | Bin 523683 -> 292643 bytes
static/screenshots/8.4.0/topology.jpg | Bin 204061 -> 120453 bytes
static/screenshots/8.4.0/trace.jpg | Bin 285366 -> 182054 bytes
themes/docsy/assets/js/base.js | 19 -------------------
themes/docsy/assets/scss/_custom_home.scss | 6 +++++-
themes/docsy/assets/scss/_custom_slider.scss | 2 +-
themes/docsy/assets/scss/_main-container.scss | 3 +++
themes/docsy/layouts/partials/head-css.html | 3 ++-
themes/docsy/layouts/partials/head.html | 5 +----
themes/docsy/layouts/partials/navbar.html | 4 ++--
themes/docsy/layouts/partials/scripts-home.html | 1 +
themes/docsy/layouts/partials/scripts.html | 2 +-
.../docsy/layouts/shortcodes/blocks/section.html | 1 -
themes/docsy/layouts/shortcodes/blocks/users.html | 4 ++--
themes/docsy/static/js/bootstrap.bundle.min.js | 7 +++++++
themes/docsy/static/js/jquery-3.6.0.min.js | 2 ++
22 files changed, 38 insertions(+), 44 deletions(-)
diff --git a/content/_index.html b/content/_index.html
index a39378c..9404435 100644
--- a/content/_index.html
+++ b/content/_index.html
@@ -8,7 +8,7 @@ linkTitle = "Apache SkyWalking"
<a class="btn btn-lg btn-primary mr-3 mb-4" href="https://github.com/apache/skywalking/tree/master/docs">
Quick Start<i class="fas fa-arrow-alt-circle-right ml-2"></i>
</a>
- <a class="btn btn-lg btn-secondary mr-3 mb-4" href="https://github.com/apache/skywalking">
+ <a class="btn btn-lg btn-secondary mb-4" href="https://github.com/apache/skywalking">
GitHub<i class="fab fa-github ml-2 "></i>
</a>
<p class="lead mt-5">
@@ -32,8 +32,7 @@ linkTitle = "Apache SkyWalking"
<div class="swiper-container arch-swiper-container">
<div class="swiper-wrapper">
<div class="swiper-slide">
- <img src="/images/skywalking-arch-3800x1700.jpg" width="" alt="Cloud Native Computing Foundation" title="Cloud Native Computing Foundation">
-
+ <img src="/images/skywalking-arch-3800x1700.jpg" alt="architecture" title="architecture">
</div>
<div class="swiper-slide">
<img src="/screenshots/8.4.0/dashboard_01.jpg" width="" alt="dashboard" title="dashboard">
@@ -79,7 +78,7 @@ linkTitle = "Apache SkyWalking"
</p>
<p>
- <a class="btn btn-lg mb-5 btn-primary demo-link" target="_blank" href="http://demo.skywalking.apache.org/">
+ <a class="btn btn-lg mb-5 btn-primary demo-link" rel="noopener noreferrer" target="_blank" href="http://demo.skywalking.apache.org/">
Go
</a>
</p>
@@ -98,7 +97,7 @@ linkTitle = "Apache SkyWalking"
<div class="container flex-wrapper">
<div class="home-li">
- <img src="/images/search.svg" class="pic" data-nolightbox="true">
+ <img src="/images/search.svg" alt="Observability" width="60" height="60" class="pic" data-nolightbox="true">
<h6 class="desc">Consistent Observability</h6>
<span class="line"></span>
<div class="box">
@@ -111,7 +110,7 @@ linkTitle = "Apache SkyWalking"
<div class="home-li">
- <img src="/images/more.svg" class="pic" data-nolightbox="true">
+ <img src="/images/more.svg" alt="Multiple Language Agents" width="60" height="60" class="pic" data-nolightbox="true">
<h6 class="desc">Multiple Language Agents</h6>
<span class="line"></span>
<div class="box">
@@ -128,7 +127,7 @@ linkTitle = "Apache SkyWalking"
<div class="home-li">
- <img src="/images/light.svg" class="pic" data-nolightbox="true">
+ <img src="/images/light.svg" alt="Lightweight" width="60" height="60" class="pic" data-nolightbox="true">
<h6 class="desc">Lightweight</h6>
<span class="line"></span>
<div class="box">
@@ -137,7 +136,7 @@ linkTitle = "Apache SkyWalking"
</div>
</div>
<div class="home-li">
- <img src="/images/list.svg" class="pic" data-nolightbox="true">
+ <img src="/images/list.svg" alt="Modular" width="60" height="60" class="pic" data-nolightbox="true">
<h6 class="desc">Modular</h6>
<span class="line"></span>
<div class="box">
@@ -149,7 +148,7 @@ linkTitle = "Apache SkyWalking"
<div class="home-li">
- <img src="/images/alarm.svg" class="pic" data-nolightbox="true">
+ <img src="/images/alarm.svg" alt="Alarm Supported" width="60" height="60" class="pic" data-nolightbox="true">
<h6 class="desc">Alarm Supported</h6>
<span class="line"></span>
<div class="box">
@@ -161,7 +160,7 @@ linkTitle = "Apache SkyWalking"
</div>
</div>
<div class="home-li">
- <img src="/images/ui.svg" class="pic" data-nolightbox="true">
+ <img src="/images/ui.svg" alt="Fancy Visualization" width="60" height="60" class="pic" data-nolightbox="true">
<h6 class="desc">Fancy Visualization</h6>
<span class="line"></span>
<div class="box">
diff --git a/layouts/shortcodes/downloads-block.html b/layouts/shortcodes/downloads-block.html
index fe37176..5c06771 100755
--- a/layouts/shortcodes/downloads-block.html
+++ b/layouts/shortcodes/downloads-block.html
@@ -22,7 +22,7 @@
{{ $version := .version }}
<div class="dropdown-item">
{{range .downloadLink}}
- [<a href="{{.link}}" data-label="[{{$name}}]-[Source]-[{{$version}}]-[{{.name}}]" target="_blank">{{.name}}</a>]
+ [<a href="{{.link}}" data-label="[{{$name}}]-[Source]-[{{$version}}]-[{{.name}}]" rel="noopener noreferrer" target="_blank">{{.name}}</a>]
{{end}}
</div>
{{end}}
@@ -42,7 +42,7 @@
{{ $version := .version }}
<div class="dropdown-item">
{{range .downloadLink}}
- [<a href="{{.link}}" data-label="[{{$name}}]-[Distribution]-[{{$version}}]-[{{.name}}]" target="_blank">{{.name}}</a>]
+ [<a href="{{.link}}" data-label="[{{$name}}]-[Distribution]-[{{$version}}]-[{{.name}}]" rel="noopener noreferrer" target="_blank">{{.name}}</a>]
{{end}}
</div>
{{end}}
diff --git a/static/screenshots/8.4.0/alarm.jpg b/static/screenshots/8.4.0/alarm.jpg
old mode 100644
new mode 100755
index e9b494f..a5ae652
Binary files a/static/screenshots/8.4.0/alarm.jpg and b/static/screenshots/8.4.0/alarm.jpg differ
diff --git a/static/screenshots/8.4.0/dashboard_01.jpg b/static/screenshots/8.4.0/dashboard_01.jpg
old mode 100644
new mode 100755
index d9a87d2..16426ed
Binary files a/static/screenshots/8.4.0/dashboard_01.jpg and b/static/screenshots/8.4.0/dashboard_01.jpg differ
diff --git a/static/screenshots/8.4.0/dashboard_02.jpg b/static/screenshots/8.4.0/dashboard_02.jpg
old mode 100644
new mode 100755
index 0ea3413..c03cae2
Binary files a/static/screenshots/8.4.0/dashboard_02.jpg and b/static/screenshots/8.4.0/dashboard_02.jpg differ
diff --git a/static/screenshots/8.4.0/dashboard_03.jpg b/static/screenshots/8.4.0/dashboard_03.jpg
old mode 100644
new mode 100755
index 184fb63..128d7d9
Binary files a/static/screenshots/8.4.0/dashboard_03.jpg and b/static/screenshots/8.4.0/dashboard_03.jpg differ
diff --git a/static/screenshots/8.4.0/log.jpg b/static/screenshots/8.4.0/log.jpg
old mode 100644
new mode 100755
index 8d4aabc..87ce3d3
Binary files a/static/screenshots/8.4.0/log.jpg and b/static/screenshots/8.4.0/log.jpg differ
diff --git a/static/screenshots/8.4.0/topology.jpg b/static/screenshots/8.4.0/topology.jpg
old mode 100644
new mode 100755
index 09664b7..8376ae1
Binary files a/static/screenshots/8.4.0/topology.jpg and b/static/screenshots/8.4.0/topology.jpg differ
diff --git a/static/screenshots/8.4.0/trace.jpg b/static/screenshots/8.4.0/trace.jpg
old mode 100644
new mode 100755
index b88bef0..1f6fcf8
Binary files a/static/screenshots/8.4.0/trace.jpg and b/static/screenshots/8.4.0/trace.jpg differ
diff --git a/themes/docsy/assets/js/base.js b/themes/docsy/assets/js/base.js
index 91c5af9..2108716 100644
--- a/themes/docsy/assets/js/base.js
+++ b/themes/docsy/assets/js/base.js
@@ -61,23 +61,4 @@ limitations under the License.
});
});
- $(function () {
- if (!$('.icon-copy').length) {
- return
- }
- $('.icon-copy').on('click', function () {
- const input = document.createElement('input');
- document.body.appendChild(input);
- input.setAttribute('value', 'skywalking');
- input.setAttribute('style', 'opacity:0');
- input.select();
- if (document.execCommand('copy')) {
- document.execCommand('copy');
- alert('copied');
- window.open('http://demo.skywalking.apache.org/')
- }
- document.body.removeChild(input);
- })
- })
-
}(jQuery));
diff --git a/themes/docsy/assets/scss/_custom_home.scss b/themes/docsy/assets/scss/_custom_home.scss
index 7c63efb..f9ab811 100644
--- a/themes/docsy/assets/scss/_custom_home.scss
+++ b/themes/docsy/assets/scss/_custom_home.scss
@@ -5,6 +5,9 @@
display: flex;
word-break: break-word;
}
+ .td-box--1 {
+ background-color: #399ffe;
+ }
.section-head {
font-family: Lato, sans-serif;
@@ -245,7 +248,7 @@
background-color: #fff;
border: 1px solid #f2f3f5;
transition: all 0.3s linear;
- box-shadow: #e1e7ed 0px 1px 2px 0px;
+ box-shadow: #e1e7ed 0px 1px 1px 0px;
border-radius: 3px;
&:hover {
transform: translateY(-4px);
@@ -371,6 +374,7 @@
width: 120px;
margin-right: 20px;
height: 60px;
+ overflow: hidden;
background-repeat: no-repeat;
background-size: contain;
background-position: center;
diff --git a/themes/docsy/assets/scss/_custom_slider.scss b/themes/docsy/assets/scss/_custom_slider.scss
index ce93e12..8fac0e6 100644
--- a/themes/docsy/assets/scss/_custom_slider.scss
+++ b/themes/docsy/assets/scss/_custom_slider.scss
@@ -52,7 +52,7 @@
}
.navbar-brand{
- margin-left: 55px;
+ margin-left: 48px;
}
#navigation {
display: none;
diff --git a/themes/docsy/assets/scss/_main-container.scss b/themes/docsy/assets/scss/_main-container.scss
index ab430ff..7da275e 100644
--- a/themes/docsy/assets/scss/_main-container.scss
+++ b/themes/docsy/assets/scss/_main-container.scss
@@ -12,6 +12,9 @@
@include media-breakpoint-up(md) {
padding-top: 8rem;
}
+ @include media-breakpoint-down(md) {
+ padding-top: 5rem;
+ }
}
section {
diff --git a/themes/docsy/layouts/partials/head-css.html b/themes/docsy/layouts/partials/head-css.html
index 97c6be3..fa71154 100644
--- a/themes/docsy/layouts/partials/head-css.html
+++ b/themes/docsy/layouts/partials/head-css.html
@@ -1,4 +1,5 @@
-
+<link rel="preload" href="/webfonts/fa-solid-900.woff2" as="font" type="font/woff2" crossorigin="anonymous">
+<link rel="preload" href="/webfonts/fa-brands-400.woff2" as="font" type="font/woff2" crossorigin="anonymous">
{{ $scssMain := "scss/main.scss"}}
{{ if .Site.IsServer }}
{{/* Note the missing postCSS. This makes it snappier to develop in Chrome, but makes it look sub-optimal in other browsers. */}}
diff --git a/themes/docsy/layouts/partials/head.html b/themes/docsy/layouts/partials/head.html
index 2fdfd76..f286827 100644
--- a/themes/docsy/layouts/partials/head.html
+++ b/themes/docsy/layouts/partials/head.html
@@ -16,10 +16,7 @@
{{- template "_internal/twitter_cards.html" . -}}
{{- template "_internal/google_analytics_async.html" . -}}
{{ partialCached "head-css.html" . "asdf" }}
-<script
- src="https://cdn.bootcdn.net/ajax/libs/jquery/3.3.1/jquery.min.js"
- integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
- crossorigin="anonymous"></script>
+<script src="/js/jquery-3.6.0.min.js"></script>
{{ if and (.Site.Params.offlineSearch) (not .Site.Params.gcs_engine_id) }}
<script src="https://unpkg.com/lunr@2.1.6/lunr.js"></script>
<script src="/js/offline-search.js"></script>
diff --git a/themes/docsy/layouts/partials/navbar.html b/themes/docsy/layouts/partials/navbar.html
index e7f03a1..dfc3401 100644
--- a/themes/docsy/layouts/partials/navbar.html
+++ b/themes/docsy/layouts/partials/navbar.html
@@ -1,8 +1,8 @@
{{ $cover := .HasShortcode "blocks/cover" }}
<nav class="js-navbar-scroll navbar navbar-expand navbar-dark {{ if $cover}} td-navbar-cover {{ end }}flex-column flex-md-row td-navbar">
- <div class="sidebar-button"><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" viewBox="0 0 448 512" class="icon"><path fill="currentColor" d="M436 124H12c-6.627 0-12-5.373-12-12V80c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.62 [...]
+ <div class="sidebar-button"><svg width="40" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" viewBox="0 0 448 512" class="icon"><path fill="currentColor" d="M436 124H12c-6.627 0-12-5.373-12-12V80c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 1 [...]
<a class="navbar-brand" href="{{ .Site.Home.RelPermalink }}">
- <span class="navbar-logo">{{ if .Site.Params.ui.navbar_logo }}<img src="/images/logo.png"></span> {{ else }}
+ <span class="navbar-logo">{{ if .Site.Params.ui.navbar_logo }}<img width="126" height="30" src="/images/logo.png" alt="SkyWalking"></span> {{ else }}
<span class="text-uppercase font-weight-bold">{{ .Site.Title }}</span> {{ end }}
</a>
<div class="td-navbar-nav-scroll ml-md-auto" id="navigation">
diff --git a/themes/docsy/layouts/partials/scripts-home.html b/themes/docsy/layouts/partials/scripts-home.html
index 37ffa14..9422840 100644
--- a/themes/docsy/layouts/partials/scripts-home.html
+++ b/themes/docsy/layouts/partials/scripts-home.html
@@ -42,6 +42,7 @@
new Swiper('.user-swiper-container', {
lazy: {
loadPrevNext: true,
+ loadOnTransitionStart: true,
},
watchSlidesVisibility: true,
slidesPerView: num,
diff --git a/themes/docsy/layouts/partials/scripts.html b/themes/docsy/layouts/partials/scripts.html
index 8a4fb76..d415a38 100644
--- a/themes/docsy/layouts/partials/scripts.html
+++ b/themes/docsy/layouts/partials/scripts.html
@@ -1,6 +1,6 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.1.3/dist/js/bootstrap.bundle.min.js"></script>
+<script src="/js/bootstrap.bundle.min.js"></script>
{{ if .Site.Params.algolia_docsearch }}
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js"></script>
{{ end }}
diff --git a/themes/docsy/layouts/shortcodes/blocks/section.html b/themes/docsy/layouts/shortcodes/blocks/section.html
index d5897f6..839bb72 100644
--- a/themes/docsy/layouts/shortcodes/blocks/section.html
+++ b/themes/docsy/layouts/shortcodes/blocks/section.html
@@ -2,7 +2,6 @@
{{ $col_id := .Get "color" | default .Ordinal }}
{{ $height := .Get "height" | default "auto" }}
{{ $type := .Get "type" | default "" }}
-<a id="td-block-{{ .Ordinal }}" class="td-offset-anchor"></a>
<section class="row td-box td-box--{{ $col_id }} td-box--gradient td-box--height-{{ $height }}">
<div class="col">
<div class="row {{ $type }}">
diff --git a/themes/docsy/layouts/shortcodes/blocks/users.html b/themes/docsy/layouts/shortcodes/blocks/users.html
index bce7ab8..5ae4c8a 100644
--- a/themes/docsy/layouts/shortcodes/blocks/users.html
+++ b/themes/docsy/layouts/shortcodes/blocks/users.html
@@ -5,8 +5,8 @@
<div class="swiper-wrapper ">
{{ range .Site.Data.homepage.users }}
<div class="swiper-slide">
- <a href="{{.website }}" target="_blank">
- <img data-src="{{.logo}}" class="swiper-lazy" data-nolightbox="true">
+ <a href="{{.website }}" rel="noopener noreferrer" target="_blank">
+ <img data-src="{{.logo}}" class="swiper-lazy" data-nolightbox="true" alt="">
</a>
<div class="swiper-lazy-preloader"></div>
</div>
diff --git a/themes/docsy/static/js/bootstrap.bundle.min.js b/themes/docsy/static/js/bootstrap.bundle.min.js
new file mode 100644
index 0000000..7961bda
--- /dev/null
+++ b/themes/docsy/static/js/bootstrap.bundle.min.js
@@ -0,0 +1,7 @@
+/*!
+ * Bootstrap v4.6.0 (https://getbootstrap.com/)
+ * Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports,require("jquery")):"function"==typeof define&&define.amd?define(["exports","jquery"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).bootstrap={},t.jQuery)}(this,(function(t,e){"use strict";function n(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var i=n(e);function o(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0 [...]
+//# sourceMappingURL=bootstrap.bundle.min.js.map
\ No newline at end of file
diff --git a/themes/docsy/static/js/jquery-3.6.0.min.js b/themes/docsy/static/js/jquery-3.6.0.min.js
new file mode 100644
index 0000000..c4c6022
--- /dev/null
+++ b/themes/docsy/static/js/jquery-3.6.0.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l= [...]