This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch mkdocs in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
commit a34407ac1b819b840f58dc61e8597bd7950e70e4 Author: ken.lj <[email protected]> AuthorDate: Thu Aug 13 15:04:45 2020 +0800 polish code config --- .github/workflows/deploy.yml | 2 +- mkdocs_en.yml | 4 ++-- mkdocs_zh.yml | 12 ++++++------ overrides/home.html | 25 +------------------------ overrides/partials/tabs-item.html | 6 ++---- 5 files changed, 12 insertions(+), 37 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index adb929e..7875ac9 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,7 +18,7 @@ jobs: pip install \ mkdocs-material \ mkdocs-minify-plugin>=0.3 \ - mkdocs-redirects>=1.0 + mkdocs- redirects>=1.0 mkdocs --version mkdocs build -f mkdocs_en.yml -d ./output/en-us && mkdocs build -f mkdocs_zh.yml -d ./output/zh-cn mkdir deploy-dist && cp -R img ./output/zh-cn/ && cp -R img ./output/en-us/ && cp -R ./output/* deploy-dist/ diff --git a/mkdocs_en.yml b/mkdocs_en.yml index 422d9ed..0af2f9c 100644 --- a/mkdocs_en.yml +++ b/mkdocs_en.yml @@ -1,8 +1,8 @@ site_name: Apache Dubbo repo_url: https://github.com/apache/dubbo-website/ -edit_uri: edit/master/documentations/2.7/en-us/docs/ +edit_uri: edit/master/en-us/ site_description: >- - Apache Dubbo™ is a Microservices Framework,它提供高性能 RPC 通信、服务发现、流量管理等服务治理能力,为你提供构建大规模微服务集群所需的全套解决方案。 + Apache Dubbo™ is a Microservices Framework。 docs_dir: 'en-us' nav: diff --git a/mkdocs_zh.yml b/mkdocs_zh.yml index aa1e1c8..4b89ea4 100644 --- a/mkdocs_zh.yml +++ b/mkdocs_zh.yml @@ -1,12 +1,12 @@ -site_name: Dubbo 2.7.8 +site_name: Apache Dubbo repo_url: https://github.com/apache/dubbo-website/ -edit_uri: edit/master/documentations/2.7/zh-cn/docs/ +edit_uri: edit/master/zh-cn/ site_description: >- Apache Dubbo™ 是一款微服务框架(Microservices Framework),它提供高性能 RPC 通信、服务发现、流量管理等服务治理能力,为你提供构建大规模微服务集群所需的全套解决方案。 docs_dir: 'zh-cn' nav: - - "Home": 'index.md' - - "Docs": + - "首页": 'index.md' + - "文档": - "2.7": - "用户手册": - "入门": @@ -171,9 +171,9 @@ nav: - "需求": 'docs/3.0/user/preface/background.md' - "架构": 'docs/3.0/user/preface/architecture.md' - "用法": 'docs/3.0/user/preface/usage.md' - - "Blog": + - "博客": - "2019-2020 回顾": 'blog/apache-dubbo-2019-2020.md' - - "Developers": + - "开发者指南": - "开发者指引": 'developers/developers_dev.md' # Configuration theme: diff --git a/overrides/home.html b/overrides/home.html index 42e0846..97d9aea 100755 --- a/overrides/home.html +++ b/overrides/home.html @@ -426,7 +426,7 @@ This file was automatically generated - do not edit </div> </div> <div class="md-footer-social"> - <a href="https://github.com/bfenetworks/bfe" target="_blank" rel="noopener" title="github.com" + <a href="https://github.com/apache/dubbo" target="_blank" rel="noopener" title="github.com" class="md-footer-social__link"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"> <path @@ -434,29 +434,6 @@ This file was automatically generated - do not edit </path> </svg> </a> - <a href="https://twitter.com/BfeNetworks" target="_blank" rel="noopener" title="twitter.com" - class="md-footer-social__link"> - <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"> - <path - d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.95 [...] - </path> - </svg> - </a> - <a href="https://slack.cncf.io" - target="_blank" rel="noopener" title="join.slack.com" class="md-footer-social__link"> - <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"> - <path - d="M94.12 315.1c0 25.9-21.16 47.06-47.06 47.06S0 341 0 315.1c0-25.9 21.16-47.06 47.06-47.06h47.06v47.06zm23.72 0c0-25.9 21.16-47.06 47.06-47.06s47.06 21.16 47.06 47.06v117.84c0 25.9-21.16 47.06-47.06 47.06s-47.06-21.16-47.06-47.06V315.1zm47.06-188.98c-25.9 0-47.06-21.16-47.06-47.06S139 32 164.9 32s47.06 21.16 47.06 47.06v47.06H164.9zm0 23.72c25.9 0 47.06 21.16 47.06 47.06s-21.16 47.06-47.06 47.06H47.06C21.16 243.96 0 222.8 0 196.9s21.16-47.06 47.06-47.06H164.9zm188.98 4 [...] - </path> - </svg> - </a> - <a href="mailto:[email protected]" target="_blank" rel="noopener" title="" class="md-footer-social__link"> - <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"> - <path - d="M502.3 190.8c3.9-3.1 9.7-.2 9.7 4.7V400c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V195.6c0-5 5.7-7.8 9.7-4.7 22.4 17.4 52.1 39.5 154.1 113.6 21.1 15.4 56.7 47.8 92.2 47.6 35.7.3 72-32.8 92.3-47.6 102-74.1 131.6-96.3 154-113.7zM256 320c23.2.4 56.6-29.2 73.4-41.4 132.7-96.3 142.8-104.7 173.4-128.7 5.8-4.5 9.2-11.5 9.2-18.9v-19c0-26.5-21.5-48-48-48H48C21.5 64 0 85.5 0 112v19c0 7.4 3.4 14.3 9.2 18.9 30.6 23.9 40.7 32.4 173.4 128.7 16.8 12.2 50.2 41.8 73.4 41.4z"> - </path> - </svg> - </a> </div> </div> </div> diff --git a/overrides/partials/tabs-item.html b/overrides/partials/tabs-item.html index 63f8f08..89ad541 100755 --- a/overrides/partials/tabs-item.html +++ b/overrides/partials/tabs-item.html @@ -44,8 +44,6 @@ <li class="md-tabs__item">{{nav_item.title}} <ul class="md-tabs__list"> {% for versions_nav_item in nav_item.children %} - {% set versions_title = versions_title | default(versions_nav_item.title) %} - <!-- Recurse, if the first item has nested items --> {% if (versions_nav_item.children | first).children %} {% set nav_item = versions_nav_item.children | first %} @@ -59,14 +57,14 @@ href="{{ (versions_nav_item.children | first).url | url }}" class="md-tabs__link md-tabs__link--active" > - {{ versions_title }} + {{ versions_nav_item.title }} </a> {% else %} <a href="{{ (versions_nav_item.children | first).url | url }}" class="md-tabs__link" > - {{ versions_title }} + {{ versions_nav_item.title }} </a> {% endif %} </li>
