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 2023/03/13 05:31:21 UTC

[skywalking-website] branch master updated: Add Chinese information navigation (#581)

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 da8a2fe0e50 Add Chinese information navigation (#581)
da8a2fe0e50 is described below

commit da8a2fe0e5048d3732c9bd9c421fcce089802523
Author: Juntao Zhang <71...@qq.com>
AuthorDate: Mon Mar 13 13:31:16 2023 +0800

    Add Chinese information navigation (#581)
---
 config.toml                                        |  5 ----
 themes/docsy/assets/scss/_nav.scss                 |  8 ++++--
 themes/docsy/layouts/partials/navbar.html          | 18 ++++++++++++-
 .../docsy/layouts/partials/sidebar-skywalking.html | 30 +++++++++++++++++++---
 4 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/config.toml b/config.toml
index 2d8b56d126a..5df8d9c583f 100644
--- a/config.toml
+++ b/config.toml
@@ -156,11 +156,6 @@ weight = 1
     weight = 50
     url = "/users"
 
-[[menu.main]]
-    name = "中文博客"
-    weight = 60
-    url = "zh"
-
 [[menu.main]]
     name = "Links"
     weight = 70
diff --git a/themes/docsy/assets/scss/_nav.scss b/themes/docsy/assets/scss/_nav.scss
index 5685dfbf3b9..f4099c74c3e 100644
--- a/themes/docsy/assets/scss/_nav.scss
+++ b/themes/docsy/assets/scss/_nav.scss
@@ -19,7 +19,7 @@ $primary: #fff;
     .navbar-nav-wrapper{
         .nav-item {
             &:last-child{
-                .nav-link{
+                .nav-link {
                     &::before{
                         content:'CN';
                         background: #F8F9FA;
@@ -29,7 +29,6 @@ $primary: #fff;
                         margin-right: 4px;
                     }
                 }
-
             }
         }
     }
@@ -108,6 +107,11 @@ $primary: #fff;
                 color: blue;
             }
         }
+        &.blog {
+            .dropdown-menu {
+                left: 0;
+            }
+        }
     }
     @include media-breakpoint-down(md) {
         padding-right: .5rem;
diff --git a/themes/docsy/layouts/partials/navbar.html b/themes/docsy/layouts/partials/navbar.html
index 3d4f904be66..0f3bee4cb0c 100644
--- a/themes/docsy/layouts/partials/navbar.html
+++ b/themes/docsy/layouts/partials/navbar.html
@@ -26,7 +26,23 @@
 				{{ $baseurl := urls.Parse $.Site.Params.Baseurl }}
 				<a class="nav-link{{if $active }} active{{end}}" href="{{ with .Page }}{{ .RelPermalink }}{{ else }}{{ .URL | relLangURL }}{{ end }}" {{ if ne $url.Host $baseurl.Host }}target="_blank" {{ end }}><span{{if $active }} class="active"{{end}}>{{ .Name }}</span></a>
 			</li>
-            {{ end }} {{ end }}
+            {{ end }}
+            {{ end }}
+            <li class="nav-item mr-3 mb-lg-0">
+                <span class="link dropdown blog">
+                    <a class="link-name nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">中文资料</a>
+                    <div class="dropdown-menu">
+                        <a class="dropdown-item" href="/zh/">博客</a>
+                        <a class="dropdown-item" href="https://space.bilibili.com/390683219" target="_blank" rel="noopener noreferrer">
+                            B站
+                        </a>
+                        <a class="dropdown-item" href="https://juejin.cn/user/13673577331607" target="_blank" rel="noopener noreferrer">
+                            掘金
+                        </a>
+                    </div>
+                </span>
+            </li>
+
             {{ if  .Site.Params.versions }}
 			<li class="nav-item dropdown d-none d-lg-block">
 				{{ partial "navbar-version-selector.html" . }}
diff --git a/themes/docsy/layouts/partials/sidebar-skywalking.html b/themes/docsy/layouts/partials/sidebar-skywalking.html
index fbda52e1e09..fe354cd03f1 100644
--- a/themes/docsy/layouts/partials/sidebar-skywalking.html
+++ b/themes/docsy/layouts/partials/sidebar-skywalking.html
@@ -8,11 +8,33 @@
         <div class="nav-item"><a href="/downloads/" class="nav-link">Downloads</a></div>
         <div class="nav-item"><a href="/team/" class="nav-link">Team</a></div>
         <div class="nav-item"><a href="/users/" class="nav-link">Users</a></div>
-        <div class="nav-item"><a href="/zh/" class="nav-link">中文博客</a></div>
         <div class="nav-item">
-            <div class="dropdown-wrapper open"><a class="dropdown-title"><span>Links</span> <span
-                    class="arrow down"></span></a>
-                <ul class="nav-dropdown" style="">
+            <div class="dropdown-wrapper open">
+                <a class="dropdown-title"><span>中文资料</span>
+                    <span class="arrow down"></span>
+                </a>
+                <ul class="nav-dropdown">
+                    <li class="dropdown-item">
+                        <a href="/zh/" class="nav-link external">博客</a>
+                    </li>
+                    <li class="dropdown-item">
+                        <a href="https://space.bilibili.com/390683219" target="_blank"
+                           rel="noopener noreferrer" class="nav-link external">B站</a>
+                    </li>
+                    <li class="dropdown-item">
+                        <a href="https://juejin.cn/user/13673577331607" target="_blank"
+                           rel="noopener noreferrer" class="nav-link external">掘金</a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+        <div class="nav-item">
+            <div class="dropdown-wrapper open">
+                <a class="dropdown-title">
+                    <span>Links</span>
+                    <span class="arrow down"></span>
+                </a>
+                <ul class="nav-dropdown">
                     <li class="dropdown-item">
                         <a href="http://www.apache.org/" target="_blank"
                            rel="noopener noreferrer" class="nav-link external">