You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ma...@apache.org on 2019/09/19 02:35:27 UTC
[servicecomb-website] branch master updated (4cc22a7 -> cd89bfa)
This is an automated email from the ASF dual-hosted git repository.
mabin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git.
from 4cc22a7 add mesher release
new eaa4849 adjustment page
new cd89bfa Update the README file for how to publish the website
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 21 ++++++++++-
_data/navigation.yml | 70 +++++++++++++++++++++++++++--------
_data/ui-text.yml | 2 +
_developers/cn/developer-guide.md | 4 +-
_developers/developer-guide.md | 4 +-
_includes/author-profile.html | 4 +-
_includes/footer.html | 8 ++++
_includes/masthead.html | 50 ++++++++++++++++++++++++-
_pages/cn/home.md | 9 +++--
_pages/home.md | 8 ++--
_sass/minimal-mistakes.scss | 2 +-
_sass/minimal-mistakes/_masthead.scss | 24 ++++++++++++
_sass/minimal-mistakes/_page.scss | 4 ++
13 files changed, 177 insertions(+), 33 deletions(-)
[servicecomb-website] 01/02: adjustment page
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mabin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git
commit eaa4849c61e6d019abe64103c3f378daf64d1ae1
Author: chinx <c5...@126.com>
AuthorDate: Tue Sep 17 18:02:32 2019 +0800
adjustment page
---
_data/navigation.yml | 70 +++++++++++++++++++++++++++--------
_data/ui-text.yml | 2 +
_developers/cn/developer-guide.md | 4 +-
_developers/developer-guide.md | 4 +-
_includes/author-profile.html | 4 +-
_includes/footer.html | 8 ++++
_includes/masthead.html | 50 ++++++++++++++++++++++++-
_pages/cn/home.md | 9 +++--
_pages/home.md | 8 ++--
_sass/minimal-mistakes.scss | 2 +-
_sass/minimal-mistakes/_masthead.scss | 24 ++++++++++++
_sass/minimal-mistakes/_page.scss | 4 ++
12 files changed, 157 insertions(+), 32 deletions(-)
diff --git a/_data/navigation.yml b/_data/navigation.yml
index e6ab76f..39a4c63 100755
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -2,18 +2,37 @@
t:
en:
main:
- - title: "Quick Start"
- url: /docs/quick-start/
- - title: "Users"
- url: /users/
- - title: "Developers"
+ - title: "Home"
+ url: /
+ group: "home"
+ - title: "Projects"
url: /developers/
+ group: "projects"
+ - title: "Resources"
+ url: /users/
+ group: "users"
+ children:
+ - title: "Quick Start"
+ url: /docs/quick-start/
+ group: "users"
+ - title: "Docs"
+ url: /users/
+ group: "users"
+ - title: "Video"
+ url: /slides/
+ group: "users"
+ - title: "FAQ"
+ url: /faqs/
+ group: "users"
+ - title: "Community"
+ url: /developers/contributing/
+ group: "developers"
- title: "Blogs"
url: /year-archive/
- - title: "FAQ"
- url: /faqs/
+ group: "year-archive"
- title: "Downloads"
url: /release/
+ group: "release"
docs:
- title: "Development of microservices application based on java microservice SDK"
@@ -64,7 +83,7 @@ t:
- title: ServiceCenter User Guide
url: https://docs.servicecomb.io/service-center/en_US/index.html
developers:
- - title: "Developer Guide"
+ - title: "Projects"
url: /developers/
- title: "Team"
url: /developers/team/
@@ -135,18 +154,37 @@ t:
cn:
main:
- - title: "快速入门"
- url: /cn/docs/quick-start/
- - title: "用户手册"
- url: /cn/users/
- - title: "开发者手册"
+ - title: "主页"
+ url: /cn/
+ group: "home"
+ - title: "项目"
url: /cn/developers/
+ group: "projects"
+ - title: "资料"
+ url: /cn/users/
+ group: "users"
+ children:
+ - title: "快速入门"
+ url: /cn/docs/quick-start/
+ group: "users"
+ - title: "用户手册"
+ url: /cn/users/
+ group: "users"
+ - title: "大咖视频"
+ url: /cn/slides/
+ group: "users"
+ - title: "常见问题"
+ url: /cn/faqs/
+ group: "users"
+ - title: "社区"
+ url: /cn/developers/contributing/
+ group: "developers"
- title: "博文"
url: /cn/year-archive/
- - title: "常见问题"
- url: /cn/faqs/
+ group: "year-archive"
- title: "下载"
url: /cn/release/
+ group: "release"
docs:
- title: "基于java微服务SDK开发微服务应用"
@@ -199,7 +237,7 @@ t:
url: https://docs.servicecomb.io/service-center/zh_CN/index.html
developers:
- - title: "开发者指南"
+ - title: "项目列表"
url: /cn/developers/
- title: "开发团队"
url: /cn/developers/team/
diff --git a/_data/ui-text.yml b/_data/ui-text.yml
index 488afc9..2c4d915 100644
--- a/_data/ui-text.yml
+++ b/_data/ui-text.yml
@@ -59,6 +59,7 @@ en: &DEFAULT_EN
events : "Events"
sponsorship : "Sponsorship"
thanks : "Thanks"
+ connect_us : "Connect Us"
en-US:
<<: *DEFAULT_EN
en-CA:
@@ -388,6 +389,7 @@ zh: &DEFAULT_ZH
events : "活动"
sponsorship : "赞助"
thanks : "鸣谢"
+ connect_us : "联系我们"
cn:
<<: *DEFAULT_ZH
zh-CN:
diff --git a/_developers/cn/developer-guide.md b/_developers/cn/developer-guide.md
index 20c60f4..0f30a7e 100755
--- a/_developers/cn/developer-guide.md
+++ b/_developers/cn/developer-guide.md
@@ -1,9 +1,9 @@
---
-title: "开发者指南"
+title: "项目列表"
lang: cn
ref: developer-guide
permalink: /cn/developers/
-excerpt: "开发者指南"
+excerpt: "项目列表"
last_modified_at: 2017-06-24T19:18:43+08:00
---
{% include toc %}
diff --git a/_developers/developer-guide.md b/_developers/developer-guide.md
index 9bc2ab5..0509895 100755
--- a/_developers/developer-guide.md
+++ b/_developers/developer-guide.md
@@ -1,9 +1,9 @@
---
-title: "Developer Guide"
+title: "Projects"
lang: en
ref: developer-guide
permalink: /developers/
-excerpt: "Developer Guide"
+excerpt: "Projects"
last_modified_at: 2017-06-24T19:18:43+08:00
---
{% include toc %}
diff --git a/_includes/author-profile.html b/_includes/author-profile.html
index 10e55ed..2c1d039 100644
--- a/_includes/author-profile.html
+++ b/_includes/author-profile.html
@@ -141,8 +141,8 @@
{% if author.github %}
<li>
- <a href="https://github.com/{{ author.github }}" itemprop="sameAs">
- <i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub
+ <a href="https://github.com/search?q=org:apache+{{ author.github }}&unscoped_q={{ author.github }}" itemprop="sameAs">
+ <i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub<br>
</a>
</li>
{% endif %}
diff --git a/_includes/footer.html b/_includes/footer.html
index a67a61a..a141afb 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -50,6 +50,14 @@
</li>
</ul>
</div>
+ <div class="col">
+ <ul class="social-icons">
+ <p class="header">{{ site.data.ui-text[page.lang].connect_us | default: "Connect Us" }}</p>
+ <li>
+ <img src="/assets/images/QRcode.png"/>
+ </li>
+ </ul>
+ </div>
</div>
</div>
<div class="page__footer-bottom">
diff --git a/_includes/masthead.html b/_includes/masthead.html
index cbf2bee..ec97162 100755
--- a/_includes/masthead.html
+++ b/_includes/masthead.html
@@ -1,4 +1,4 @@
-<div class="masthead">
+<div class="masthead" onmouseleave="$('#childrenShow').css('display', 'none')">
<div class="masthead__inner-wrap">
<div class="masthead__menu">
<nav id="site-nav" class="greedy-nav">
@@ -14,15 +14,61 @@
{% else %}
{% assign domain = site.url | append: site.baseurl %}
{% endif %}
- <li class="masthead__menu-item">
+ {% assign pageUrl = page.url %}
+ {% if page.lang == "cn" %}
+ {% assign prefixSize = page.url.size | minus:1 %}
+ {% assign pageUrl = page.url | slice: 3, prefixSize %}
+ {% endif %}
+ {% if link.children == null %}
+ <li class="masthead__menu-item" onmouseenter="$('#childrenShow').css('display', 'none')">
+ {% if pageUrl == '/' %}
+ {% if link.group == 'home' %}
+ <a class="active" href="{{ domain }}{{ link.url }}">{{ link.title }}</a>
+ {% else %}
+ <a href="{{ domain }}{{ link.url }}">{{ link.title }}</a>
+ {% endif %}
+
+ {% elsif pageUrl == '/developers/' %}
+ {% if link.group == 'projects' %}
+ <a class="active" href="{{ domain }}{{ link.url }}">{{ link.title }}</a>
+ {% else %}
+ <a href="{{ domain }}{{ link.url }}">{{ link.title }}</a>
+ {% endif %}
+ {% elsif pageUrl contains link.group %}
+ <a class="active" href="{{ domain }}{{ link.url }}">{{ link.title }}</a>
+ {% else %}
+ <a href="{{ domain }}{{ link.url }}">{{ link.title }}</a>
+ {% endif %}
+ </li>
+ {% else %}
+ <li class="def-nav-li" onmouseenter="$('#childrenShow').css('display', 'block')">
{% assign prefixSize = link.url.size | minus:1 %}
{% assign prefix = link.url | slice: 0, prefixSize %}
{% if page.url contains prefix %}
+ {% assign act = 'true' %}
+ {% else %}
+ {% for child in link.children %}
+ {% assign cSize = child.url.size | minus:1 %}
+ {% assign cPrefix = child.url | slice: 0, cSize %}
+ {% if page.url contains cPrefix %}
+ {% assign act = 'true' %}
+ {% endif %}
+ {% endfor %}
+ {% endif %}
+
+ {% if act != null %}
<a class="active" href="{{ domain }}{{ link.url }}">{{ link.title }}</a>
{% else %}
<a href="{{ domain }}{{ link.url }}">{{ link.title }}</a>
{% endif %}
+
+ <ul id="childrenShow" class="def-children-show" onmouseleave="$('#childrenShow').css('display', 'none')">
+ {% for child in link.children %}
+ <li><a href="{{ domain }}{{ child.url }}" class="{{ active }}">{{ child.title }}</a></li>
+ {% endfor %}
+ </ul>
</li>
+ {% endif %}
{% endfor %}
</ul>
<button><div class="navicon"></div></button>
diff --git a/_pages/cn/home.md b/_pages/cn/home.md
index 42b9ebc..a917338 100755
--- a/_pages/cn/home.md
+++ b/_pages/cn/home.md
@@ -8,10 +8,11 @@ header:
caption:
excerpt: '开箱即用、高性能、兼容流行生态、支持多语言的一站式开源微服务解决方案
-
-<div class="excerpt-label">下载最新版本:</div>
-<div class="button-group">
-<a href="/cn/release" class="home-button btn--info">ServiceComb 1.2.0</a>
+<div class="button-group def-inline-block">
+ <a href="/cn/release" class="home-button btn--info">下载</a>
+</div>
+<div class="button-group def-inline-block">
+ <a href="/cn/docs/quick-start/" class="home-button btn--info">快速入门</a>
</div>'
intro:
diff --git a/_pages/home.md b/_pages/home.md
index a90a7f1..f18c26b 100755
--- a/_pages/home.md
+++ b/_pages/home.md
@@ -8,9 +8,11 @@ header:
caption:
excerpt: 'Open-Source, Full-Stack Microservice Solution.With out of the box, high performance, compatible with popular ecology, multi-language support
-<div class="excerpt-label">Download latest release:</div>
-<div class="button-group">
-<a href="/release" class="home-button btn--info">ServiceComb 1.2.0</a>
+<div class="button-group def-inline-block">
+ <a href="/release" class="home-button btn--info">Download</a>
+</div>
+<div class="button-group def-inline-block">
+ <a href="/docs/quick-start/" class="home-button btn--info">Quick Start</a>
</div>'
intro:
diff --git a/_sass/minimal-mistakes.scss b/_sass/minimal-mistakes.scss
index 7a6af4a..0857733 100644
--- a/_sass/minimal-mistakes.scss
+++ b/_sass/minimal-mistakes.scss
@@ -44,4 +44,4 @@
/* Custom CSS */
@import "custom/head";
@import "custom/page";
-@import "custom/utilities"
+@import "custom/utilities";
diff --git a/_sass/minimal-mistakes/_masthead.scss b/_sass/minimal-mistakes/_masthead.scss
index 1d156a9..2d5f42d 100644
--- a/_sass/minimal-mistakes/_masthead.scss
+++ b/_sass/minimal-mistakes/_masthead.scss
@@ -88,3 +88,27 @@
font-weight: 700;
}
}
+
+.def-nav-li {
+ display: block;
+ list-style-type: none;
+ white-space: nowrap;
+
+ .def-children-show {
+ display: none;
+ position: absolute;
+ top: 55px;
+ width: 108px;
+
+ li {
+ background: #000;
+ opacity: 0.8;
+ padding: 10px 20px;
+ margin-bottom: 1px;
+
+ a {
+ width: 100%;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/_sass/minimal-mistakes/_page.scss b/_sass/minimal-mistakes/_page.scss
index 0a45922..1f4518c 100644
--- a/_sass/minimal-mistakes/_page.scss
+++ b/_sass/minimal-mistakes/_page.scss
@@ -140,6 +140,10 @@
.wrapper {
margin-left: 10%;
+ .def-inline-block {
+ display: inline-block;
+ width: auto;
+ }
@media (max-width: 400px) {
.button-group {
a {
[servicecomb-website] 02/02: Update the README file for how to
publish the website
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mabin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-website.git
commit cd89bfa021a5edd99db0395d51644677e3bd4664
Author: Willem Jiang <wi...@gmail.com>
AuthorDate: Thu Sep 19 09:26:16 2019 +0800
Update the README file for how to publish the website
---
README.md | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index cd08f74..fd1f5ef 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,26 @@ Please sent your PR to the master branch instead of asf-site.
`sudo bundle exec jekyll server`
-* Start web browser to access `http://localhost:4000`
+* Start web browser to access `http://localhost:4000`
+
+# How to push the change to apache website
+
+* Switch to asf-site branch
+
+ `git checkout asf-site`
+
+* Merge the changes of master branch
+
+ `git merge master`
+
+* Generate the website static pages
+
+ `bundle exec jekyll build`
+
+* Commit the changes into git repo
+
+ `git add content `
+ `git commit -m "publish website"`
**Note that tested versions of the tools covered in this section are as following,**