You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2023/01/25 06:26:10 UTC

[dubbo-website] 01/02: Merge branch 'refactor/next' of https://github.com/apache/dubbo-website into refactor/next

This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch refactor/next
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git

commit 3a4fdaa94dc650d4dbfd560fb236ee57fbf3e04c
Merge: b28f523403 de3bb12c00
Author: chickenlj <ke...@gmail.com>
AuthorDate: Wed Jan 25 14:22:57 2023 +0800

    Merge branch 'refactor/next' of https://github.com/apache/dubbo-website into refactor/next
    
     Conflicts:
    	content/zh/releases/_index.md

 .github/actions/always-upload-cache               |   2 +-
 .github/themes/docsy                              |   2 +-
 .github/workflows/build_and_deploy_next.yml       |   1 +
 assets/scss/_custom.scss                          |  10 +--
 assets/scss/_styles_project.scss                  |  21 ++++-
 assets/scss/_variables_project.scss               |   3 +-
 cn_config.toml                                    |   4 +-
 config.toml                                       |   2 +-
 content/zh/_index.html                            |  70 ++++++++++++-----
 content/zh/releases/_index.md                     |  13 ----
 layouts/partials/head.html                        |   3 +
 layouts/shortcodes/blocks/cover.html              |  46 ++++++++---
 assets/icons/logo.svg => static/imgs/nav_logo.svg |   0
 static/imgs/nav_logo2.png                         | Bin 0 -> 17791 bytes
 static/imgs/pattern_home_hero.svg                 |  91 ++++++++++++++++++++++
 static/js/github-buttons.js                       |   6 ++
 themes/docsy                                      |   2 +-
 17 files changed, 218 insertions(+), 58 deletions(-)