diff --git a/assets/scss/header.scss b/assets/scss/header.scss
index 9232d2774..17876dfba 100644
--- a/assets/scss/header.scss
+++ b/assets/scss/header.scss
@@ -80,10 +80,11 @@
.menu-span::after {
display: inline-block;
+ vertical-align: top;
content: '';
margin-left: 5px;
- border-width: 4px 2px;
- border: solid transparent;
+ margin-top: 10px;
+ border: 4px solid transparent;
border-top-color: #fff;
}
@@ -92,12 +93,13 @@
position: absolute;
top: 40px;
box-sizing: border-box;
- width: 160px;
+ max-width: 300px;
padding: 12px 0;
left: 50%;
transform: translateX(-50%);
background: #ffffff;
line-height: 30px;
+ white-space: nowrap;
font-size: 0;
border-radius: 6px;
box-shadow: 0 4px 8px 0 rgba(36,46,66,.06),0 8px 16px 0 rgba(36,46,66,.05);
@@ -137,14 +139,6 @@
// }
}
- .menu-2 {
- width: 260px;
- }
-
- .menu-5 {
- width: 120px;
- }
-
.right-menu {
position: absolute;
top: 28px;
@@ -177,20 +171,25 @@
span::after {
display: inline-block;
+ vertical-align: top;
content: '';
margin-left: 5px;
- border-width: 4px 2px;
- border: solid transparent;
+ margin-top: 6px;
+ border: 4px solid transparent;
border-top-color: #fff;
}
}
.dropdown-menu {
color: black;
- width: 100px;
- padding-left: 20px;
+ padding: 10px 20px;
li {
padding: 0;
margin: 0;
+ color: #36435c;
+
+ &:hover {
+ color: #55bc8a;
+ }
}
}
}
@@ -208,8 +207,9 @@
}
.dropdown-menu {
- width: 300px;
top: 60px;
+ min-width: 280px;
+ white-space: normal;
}
ol {
diff --git a/content/en/_index.md b/content/en/_index.md
index 4ee9703ec..894537942 100644
--- a/content/en/_index.md
+++ b/content/en/_index.md
@@ -102,19 +102,19 @@ section4:
- name: Service Mesh (Istio-based)
icon: /images/home/service.svg
content: Provide fine-grained traffic management, observability and tracing, and offer visualization for traffic topology
- link: "../service-mesh"
+ link: "service-mesh"
color: red
- name: Rich Observability
icon: /images/home/rich.svg
content: Multi-dimensional monitoring, events and audit logs query are supported; multi-tenant log query and collection, alerting and notification are built-in
- link: "../observability"
+ link: "observability"
color: green
- name: DevOps System
icon: /images/home/dev-ops.svg
content: Out-of-box CI/CD based on Jenkins, and automated workflow tools including Source-to-Image & Binary-to-Image
- link: "/devops"
+ link: "devops"
color: orange
- name: Multiple Storage Solutions
diff --git a/content/zh/_index.md b/content/zh/_index.md
index 96c30a526..bf90d4588 100644
--- a/content/zh/_index.md
+++ b/content/zh/_index.md
@@ -102,19 +102,19 @@ section4:
- name: 基于 Istio 的微服务治理
icon: /images/home/service.svg
content: 提供细粒度的流量管理、流量监控、灰度发布、分布式追踪,支持可视化的流量拓扑
- link: "../service-mesh"
+ link: "service-mesh"
color: red
- name: 丰富的可观察性
icon: /images/home/rich.svg
content: 提供多维度与多租户的监控、日志、事件、审计搜索,支持多种告警策略与通知渠道,支持日志转发
- link: "../observability"
+ link: "observability"
color: green
- name: DevOps 系统
icon: /images/home/dev-ops.svg
content: 基于 Jenkins 为引擎打造的 CI/CD,内置 Source-to-Image 和 Binary-to-Image 自动化打包部署工具
- link: "/devops"
+ link: "devops"
color: orange
- name: 支持多种存储方案
diff --git a/layouts/404.html b/layouts/404.html
index 450a153bb..093beb940 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,9 +1,9 @@
{{ define "main" }}
{{ i18n "We can’t find the page that you’re looking for :(" }} {{ .content }} {{ .Params.createTime }} {{ substr .Summary 0 120 }} {{ .content }} {{ .content }} {{ .linkContent }} {{ .content }} {{ .name1 }} {{ .name2 }} {{ .name3 }} {{ .content }} {{ .name1 }} {{ .name2 }} {{ .name3 }}
-
+
+
+
+
{{ if .Params.bg }}
-
+
{{ end }}
+
{{ end }}
@@ -45,8 +45,8 @@
-
+
+
{{ .title }}
{{ if .videoLink }}
@@ -60,7 +60,7 @@
allowfullscreen>
{{ else }}
-
+
{{ end }}
+
{{ .Title }}
{{ range .caseList }}
+
+
{{ end }}
@@ -42,7 +42,7 @@
{{ $name := .name }}
{{ range .children }}
+
+
{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 30a815965..7ad9df8af 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -3,7 +3,7 @@
-
+
+
+
+
+
+
+
{{ end }}
{{ range .featuredPartnerList }}
+
-
+
+
+
+
+
+
+
{{ end }}
{{ .description }}
' + video.group + '
' var time = '' + video.createTime + '
' diff --git a/static/js/aside.js b/static/js/aside.js index f66522e35..57b4aeafe 100644 --- a/static/js/aside.js +++ b/static/js/aside.js @@ -11,17 +11,21 @@ var getElementBottomToTop = function(element) { } var bindAsideScroll = function() { + var screenWidth = $(window).width() + if (screenWidth <= 768) { + return false + } var content = $('.main-div') var aside = $('.aside') $( window ).scroll(function() { - var s1 = getElementBottomToTop(content) - var s2 = getElementBottomToTop(aside) - if (s2 > s1) { - aside.addClass('aside-absolute').removeClass('aside-fixed') - } - if (getElementTopToScreenTop(aside) > 150) { - aside.removeClass('aside-absolute').addClass('aside-fixed') - } + var s1 = getElementBottomToTop(content) + var s2 = getElementBottomToTop(aside) + if (s2 > s1) { + aside.addClass('aside-absolute').removeClass('aside-fixed') + } + if (getElementTopToScreenTop(aside) > 150) { + aside.removeClass('aside-absolute').addClass('aside-fixed') + } }); }