diff --git a/assets/scss/common.scss b/assets/scss/common.scss index 6d3fa8270..0526d70aa 100644 --- a/assets/scss/common.scss +++ b/assets/scss/common.scss @@ -23,6 +23,10 @@ section { } } +::-webkit-scrollbar-track { + background: transparent; +} + .padding { padding-top: 40px; } @@ -374,6 +378,7 @@ section { .code-over-div { position: relative; overflow: auto; + padding: 1em; } .copy-code-button { display: none; diff --git a/assets/scss/content.scss b/assets/scss/content.scss index 6cf856051..e49f11253 100644 --- a/assets/scss/content.scss +++ b/assets/scss/content.scss @@ -78,7 +78,6 @@ } .md-body h2 { - font-size: 24px; font-weight: 500; line-height: 64px; color: #171c34; @@ -89,7 +88,6 @@ } .md-body h3 { - font-size: 16px; font-weight: 600; line-height: 1.5; color: #171c34; @@ -142,12 +140,22 @@ } .aside { + position: fixed; + top: 150px; + left: 50%; + bottom: 10px; + transform: translateX(350px); width: 230px; - max-height: 700px; - overflow: scroll; @media only screen and (max-width: $mobile-max-width) { display: none; } + + .inner-div { + max-height: 100%; + position: relative; + overflow: scroll; + } + .title { height: 32px; font-size: 24px; @@ -178,26 +186,15 @@ color: #55bc8a; } } + + .active { + color: #55bc8a; + } } li li { padding-left: 20px; } } } - - .aside-fixed { - position: fixed; - top: 150px; - left: 50%; - transform: translateX(350px); - } - - .aside-absolute { - position: absolute; - right: 0; - bottom: 0; - top: none; - left: none; - } } } \ No newline at end of file diff --git a/assets/scss/doc.scss b/assets/scss/doc.scss index abe4131a5..ebb17dff6 100644 --- a/assets/scss/doc.scss +++ b/assets/scss/doc.scss @@ -153,20 +153,33 @@ body { } .left-div { - position: absolute; - top: 0; - left: 0; - width: 274px; - background-color: #ffffff; + position: fixed; + top: 260px; + bottom: 20px; + left: 50%; + transform: translateX(-580px); + width: 200px; z-index: 2; - transition: all 0.5s; + + @media only screen and (max-width: 1160px) { + left: 0; + transform: translateX(0px); + } @media only screen and (max-width: $mobile-max-width) { - left: -274px; + transition: all 0.5s; + left: -200px; + } + + .inner-tree { + max-height: 100%; + position: relative; + overflow: scroll; + background-color: #ffffff; } .nav-menu { - padding: 20px; + padding: 10px; font-size: 14px; color: #31383e; background-color: #f6f8fa; @@ -229,7 +242,6 @@ body { } .download-div { - width: 274px; height: 44px; margin-top: 10px; line-height: 44px; @@ -258,9 +270,9 @@ body { .middle-div { position: relative; - margin-left: 274px; - margin-right: 80px; - padding: 10px 20px; + margin-left: 200px; + margin-right: 160px; + padding: 10px 10px; @media only screen and (max-width: $mobile-max-width) { margin: 0; @@ -415,21 +427,18 @@ body { .content-div { .md-body { font-size: 16px; - line-height: 1.71; + line-height: 2.29; color: #36435c; } .md-body h2 { - font-size: 24px; font-weight: 500; line-height: 40px; - color: #171c34; text-shadow: none; text-align: left; } .md-body h3 { - font-size: 16px; font-weight: 600; line-height: 1.5; color: #171c34; @@ -579,65 +588,58 @@ body { } .aside { - position: relative; - width: 174px; - padding-left: 10px; - border-left: 1px solid #dde1e6; - max-height: 600px; - overflow: scroll; + position: fixed; + top: 260px; + bottom: 10px; + left: 50%; + transform: translateX(420px); + width: 160px; @media only screen and (max-width: $mobile-max-width) { - display: none; + display: none; + } + + .inner-div { + max-height: 100%; + position: relative; + overflow: scroll; + padding-left: 10px; + border-left: 1px solid #dde1e6; } .title { - font-size: 14px; - line-height: 1.71; - color: #3e464c; + font-size: 14px; + line-height: 1.71; + color: #3e464c; } .tabs { - #TableOfContents > ul > li > a { - font-weight: 500; - } - li { - margin: 8px 0; - font-size: 14px; - - a { - display: block; - width: 100%; - font-weight: 400; - line-height: 24px; - color: #68747f; - - &:hover { - color: #00a971; - } + #TableOfContents > ul > li > a { + font-weight: 500; } + li { + margin: 8px 0; + font-size: 14px; + + a { + display: block; + width: 100%; + font-weight: 400; + line-height: 24px; + color: #68747f; + + &:hover { + color: #00a971; + } + } - .active { - color: #00a971; + .active { + color: #00a971; + } + } + li li { + padding-left: 20px; } - } - li li { - padding-left: 20px; - } } - } - - .aside-fixed { - position: fixed; - top: 260px; - left: 50%; - transform: translateX(500px); - } - - .aside-absolute { - position: absolute; - right: -104px; - bottom: 0; - top: none; - left: none; } } diff --git a/assets/scss/docs.scss b/assets/scss/docs.scss index 15a391cb6..65d71dc4d 100644 --- a/assets/scss/docs.scss +++ b/assets/scss/docs.scss @@ -183,13 +183,16 @@ font-size: 11px; line-height: 34px; text-align: center; - color: #ffffff; border-radius: 17px; box-shadow: 0 10px 50px 0 rgba(34, 43, 62, 0.1), 0 8px 16px 0 rgba(33, 43, 61, 0.2); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.1) 97%), linear-gradient(to bottom, #242e42, #242e42); &:hover { box-shadow: none; } + + a { + color: #ffffff; + } } } } diff --git a/assets/scss/markdown.scss b/assets/scss/markdown.scss index 9e501c32a..dbb64564e 100644 --- a/assets/scss/markdown.scss +++ b/assets/scss/markdown.scss @@ -164,7 +164,7 @@ } .md-body h2 { - font-size: 32px; + font-size: 1.8em; font-weight: normal; line-height: 1.63; text-align: center; diff --git a/assets/scss/partner.scss b/assets/scss/partner.scss index 9082c4068..d27ca3801 100644 --- a/assets/scss/partner.scss +++ b/assets/scss/partner.scss @@ -360,6 +360,7 @@ font-size: 14px; line-height: 1.71; color: #ffffff; + overflow: auto; } } } diff --git a/config/_default/config.toml b/config/_default/config.toml index 5cf8fd157..cbef958cb 100644 --- a/config/_default/config.toml +++ b/config/_default/config.toml @@ -2,7 +2,7 @@ baseURL = "https://kubesphere-v3.netlify.app" [markup] [markup.tableOfContents] - endLevel = 4 + endLevel = 3 ordered = false startLevel = 2 @@ -100,7 +100,7 @@ hasChildren = true [[languages.en.menu.main]] parent = "Documentation" - name = "v3.0.0" + name = "v3.0.0 star" URL = "docs/" weight = 1 @@ -226,7 +226,7 @@ hasChildren = true name = "文档中心" [[languages.zh.menu.main]] parent = "文档中心" - name = "v3.0.0" + name = "v3.0.0 star" URL = "docs/" weight = 1 diff --git a/content/en/support/_index.md b/content/en/support/_index.md new file mode 100644 index 000000000..cd71739c1 --- /dev/null +++ b/content/en/support/_index.md @@ -0,0 +1,13 @@ +--- +title: "support" + +css: "scss/contribution.scss" + +section1: + title: 'Community is the Soul of KubeSphere' + content: 'Join the community to get help, get involved, or get updates and KubeSphere news!' + topImage: "/images/contribution/contribution-top.jpg" + +sectionIframe: + formUrl: https://jinshuju.net/f/bDS8me/embedded.js?inner_redirect=false&banner=show&background=white&height=1838 +--- \ No newline at end of file diff --git a/content/zh/support/_index.md b/content/zh/support/_index.md new file mode 100644 index 000000000..cd71739c1 --- /dev/null +++ b/content/zh/support/_index.md @@ -0,0 +1,13 @@ +--- +title: "support" + +css: "scss/contribution.scss" + +section1: + title: 'Community is the Soul of KubeSphere' + content: 'Join the community to get help, get involved, or get updates and KubeSphere news!' + topImage: "/images/contribution/contribution-top.jpg" + +sectionIframe: + formUrl: https://jinshuju.net/f/bDS8me/embedded.js?inner_redirect=false&banner=show&background=white&height=1838 +--- \ No newline at end of file diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html new file mode 100644 index 000000000..a6e54ab59 --- /dev/null +++ b/layouts/_default/_markup/render-link.html @@ -0,0 +1 @@ +{{ .Text }} \ No newline at end of file diff --git a/layouts/_default/search.html b/layouts/_default/search.html deleted file mode 100644 index e1ad53e9e..000000000 --- a/layouts/_default/search.html +++ /dev/null @@ -1,22 +0,0 @@ -{{ define "main" }} -
-
-

{{ .Title }}

-{{ with .Site.Params.gcs_engine_id }} - - -{{ end }} -
-
- -{{ end }} \ No newline at end of file diff --git a/layouts/_default/support.html b/layouts/_default/support.html new file mode 100644 index 000000000..1dd20a6ff --- /dev/null +++ b/layouts/_default/support.html @@ -0,0 +1,15 @@ +{{ define "main" }} + +{{ with .Params.section1 }} +
+
+

{{ .title }}

+

{{ .content }}

+
+
+{{ end }} + +{{ with .Params.sectionIframe }} + +{{ end }} +{{ end }} \ No newline at end of file diff --git a/layouts/docs/list.html b/layouts/docs/list.html index 11c75f434..eda545126 100644 --- a/layouts/docs/list.html +++ b/layouts/docs/list.html @@ -28,7 +28,7 @@ {{ range .list }}
-

{{ .content }}

+

{{ .content }}

{{ end }} diff --git a/layouts/docs/single.html b/layouts/docs/single.html index 1ce008e72..3bf569155 100644 --- a/layouts/docs/single.html +++ b/layouts/docs/single.html @@ -37,12 +37,14 @@
-
- {{ partial "tree.html" . }} - +
+
+ {{ partial "tree.html" . }} + +
@@ -80,15 +82,15 @@
{{ if .IsPage }} -
-
- {{ i18n "What’s on this Page" }} -
-
- {{ .TableOfContents }} +
+
+
+ {{ i18n "What’s on this Page" }} +
+
+ {{ .TableOfContents }} +
{{ end }}
-{{ if .IsPage }} -{{ end }}