From b39d1d942be8dbb71eab881120218d3048efaba6 Mon Sep 17 00:00:00 2001 From: liuboaibc Date: Mon, 22 Jun 2020 09:51:07 +0800 Subject: [PATCH 1/4] change url --- content/en/_index.md | 6 +++--- content/zh/_index.md | 6 +++--- layouts/partials/header.html | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) 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/partials/header.html b/layouts/partials/header.html index 30a815965..b215bd098 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -54,7 +54,7 @@ From 82e7ff579ad1eec4e4b10b26aff0ca2693c69d9e Mon Sep 17 00:00:00 2001 From: liuboaibc Date: Mon, 22 Jun 2020 11:01:46 +0800 Subject: [PATCH 2/4] fix footer --- assets/scss/header.scss | 22 ++++++++++------------ layouts/index.html | 4 ++-- static/js/aside.js | 20 ++++++++++++-------- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/assets/scss/header.scss b/assets/scss/header.scss index 9232d2774..c42af34d1 100644 --- a/assets/scss/header.scss +++ b/assets/scss/header.scss @@ -92,12 +92,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 +138,6 @@ // } } - .menu-2 { - width: 260px; - } - - .menu-5 { - width: 120px; - } - .right-menu { position: absolute; top: 28px; @@ -186,11 +179,15 @@ } .dropdown-menu { color: black; - width: 100px; - padding-left: 20px; + padding: 10px 20px; li { padding: 0; margin: 0; + color: #36435c; + + &:hover { + color: #55bc8a; + } } } } @@ -208,8 +205,9 @@ } .dropdown-menu { - width: 300px; top: 60px; + min-width: 280px; + white-space: normal; } ol { diff --git a/layouts/index.html b/layouts/index.html index 54b8a7c1c..d79f9bd1e 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -190,11 +190,11 @@ \ No newline at end of file diff --git a/layouts/partials/header.html b/layouts/partials/header.html index b215bd098..7ad9df8af 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -3,7 +3,7 @@
- +
@@ -118,13 +118,13 @@
diff --git a/layouts/partner/list.html b/layouts/partner/list.html index f5f97f4ab..f3036a181 100644 --- a/layouts/partner/list.html +++ b/layouts/partner/list.html @@ -15,32 +15,32 @@
{{ .title }}

{{ .content }}

- - + +
- +

{{ .name1 }}

- +

{{ .name2 }}

- +

{{ .name3 }}

- +
- + {{ end }} @@ -71,7 +71,7 @@