You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/04/18 03:08:16 UTC

[incubator-skywalking-website] branch master updated: Update: Remove incubating && Update team. (#44)

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

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-website.git


The following commit(s) were added to refs/heads/master by this push:
     new 60bac8b  Update: Remove incubating && Update team. (#44)
60bac8b is described below

commit 60bac8bcde3402e32aacd4c1c9e0eae0c7eace54
Author: Allen Wang <Al...@outlook.com>
AuthorDate: Thu Apr 18 11:08:12 2019 +0800

    Update: Remove incubating && Update team. (#44)
    
    * Update: Remove incubating && Update team.
    
    * Remove Luke and add other mentors into PMC list.
---
 docs/.vuepress/config.js                   |  4 +--
 docs/.vuepress/theme/components/Footer.vue | 39 ++++++------------------------
 docs/.vuepress/theme/layouts/Home.vue      | 22 -----------------
 docs/team/README.md                        | 31 +++++++++---------------
 docs/zh/team/README.md                     | 29 +++++++++-------------
 5 files changed, 33 insertions(+), 92 deletions(-)

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index afeccce..bd5e8ff 100755
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -4,13 +4,13 @@ module.exports = {
   locales: {
     '/': {
       lang: 'en-US', // 将会被设置为 <html> 的 lang 属性
-      title: ' Apache SkyWalking™ (incubating)|SkyWalking Team ',
+      title: ' Apache SkyWalking™ | SkyWalking Team ',
       logo: "/favicon.ico",
       head: [["link", { rel: "icon", href: `/logo.svg` }]],
     },
     '/zh/': {
       lang: 'zh-CN',
-      title: ' Apache SkyWalking™ (incubating)|SkyWalking Team ',
+      title: ' Apache SkyWalking™ | SkyWalking Team ',
       logo: "/favicon.ico",
       head: [["link", { rel: "icon", href: `/logo.svg` }]],
     }
diff --git a/docs/.vuepress/theme/components/Footer.vue b/docs/.vuepress/theme/components/Footer.vue
index f2e81c5..0c6e9c6 100755
--- a/docs/.vuepress/theme/components/Footer.vue
+++ b/docs/.vuepress/theme/components/Footer.vue
@@ -1,15 +1,7 @@
 <template>
   <footer class="footer-container">
     <div class="cols-container">
-      <div class="col col-18">
-          <dl>
-        <dt>Disclaimer</dt>
-        <dd>
-        <p>Apache SkyWalking (incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate  [...]
-            </dd>
-             </dl>
-      </div>
-      <div class="col col-6">
+      <div class="clear">
         <dl>
           <dt>ASF</dt>
           <dd class="asf">
@@ -42,7 +34,7 @@ export default {};
 
 <style>
 .footer-container{
-  padding: 2rem 2em 0.3em;
+  padding: 2rem 2em 0em;
 }
 .footer-container dt{
   font-size: 16px;
@@ -54,16 +46,17 @@ export default {};
   font-size: 12px;
   color: #999;
   line-height: 18px;
-  margin: 8px 0;
+  margin: 5px 0;
 }
 .footer-container .asf{
-  width: 40%;
+  width: 33%;
   float: left;
 }
 .footer-container  dd a {
   color: inherit;
 }
 .footer-container .copyright {
+  padding-top: 10px;
   border-top: 1px solid #eaecef;
   min-height: 60px;
   line-height: 20px;
@@ -74,27 +67,9 @@ export default {};
   display: flex;
   align-items: center;
 }
-.footer-container .cols-container .col-18 {
-    width: 75%;
-    padding-right: 70px;
-    padding-left: 10px;
-}
-.footer-container .cols-container .col-6 {
-    width: 24%;
+.footer-container .cols-container{
     padding-right: 10px;
     padding-left: 10px;
+    margin-bottom: 10px;
 }
-.footer-container .cols-container .col {
-    display: inline-block;
-    box-sizing: border-box;
-    vertical-align: top;
-}
-@media screen and (max-width: 640px) {
-  .footer-container .cols-container .col {
-      width: 100%;
-      text-align: center;
-      padding: 0;
-  }
-}
-
 </style>
diff --git a/docs/.vuepress/theme/layouts/Home.vue b/docs/.vuepress/theme/layouts/Home.vue
index b5773a1..b032e9b 100755
--- a/docs/.vuepress/theme/layouts/Home.vue
+++ b/docs/.vuepress/theme/layouts/Home.vue
@@ -9,7 +9,6 @@
             <div class="product-name">
               <div class="avatar-title">
                 Apache SkyWalking
-                <span class="incubating">Incubating</span>
               </div>
             </div>
             <p
@@ -113,27 +112,6 @@ export default {
 
 <style>
 .clear:after{display:table; content:''; clear:both;}
-.incubating{
-  font-size: 18px;vertical-align: top;
-  position: relative;
-  background:rgba(255, 255, 255, 0.15);
-  padding: 3px 10px 3px 12px;
-  border-radius: 4px;
-}
-.incubating::after {
-  right: 100%;
-	top: 50%;
-	border: solid transparent;
-	content: " ";
-	height: 0;
-	width: 0;
-	position: absolute;
-	pointer-events: none;
-	border-color: rgba(0, 0, 0, 0);
-	border-right-color: rgba(255, 255, 255, 0.15);
-	border-width: 8px;
-	margin-top: -8px;
-}
 .avatar {
   overflow: hidden;
   position: relative;
diff --git a/docs/team/README.md b/docs/team/README.md
index 499dc4f..090e722 100755
--- a/docs/team/README.md
+++ b/docs/team/README.md
@@ -6,42 +6,35 @@ The SkyWalking team is comprised of Members and Contributors. Members have direc
 
 Members include PPMC, committer and mentor of SkyWalking project. The List in alphabeta order.
 
-### Incubator Mentor
-
-| Name |Apache ID|
-|:---:|:--:|
-|Ignasi Barrera| nacx |
-|Luke Han| lukehan |
-|Michael Semb Wever| mck |
-|Willem Ning Jiang| ningjiang |
-
-### PPMC
+### PMC
 | Name |Apache ID|
 :---:|:--:|
+|Can Li| lican |
 |DongXue Si| ilucky |
 |Haoyang Liu| liuhaoyangzz |
 |Hongtao Gao| hanahmily |
+|Ignasi Barrera| nacx |
 |Jian Tan| tanjian |
-|Sheng Wang| wangsheng |
 |Sheng Wu| wusheng |
 |Shinn Zhang| zhangxin |
 |Kai Wang| wangkai |
+|Michael Semb Wever| mck |
+|Jiaqi Lin| linjiaqi |
+|Jinlin Fu| withlin |
+|Lang Li| lilang |
+|Wenbing Wang| wangwenbin |
+|Willem Ning Jiang| ningjiang |
 |Yang Bai| baiyang |
 |Yao Wang| ywang |
+|Yixiong Cao| caoyixiong |
 |Yongsheng Peng| pengys |
-|Yuntao Li| liyuntao |
 |Zhang Kewei| zhangkewei |
 
 ### Committer
 | Name |Apache ID|
 |:---:|:--:|
-|Can Li| lican |
-|Jiaqi Lin| linjiaqi |
-|Jinlin Fu| withlin |
-|Lang Li| lilang |
-|Yixiong Cao| caoyixiong |
-|Wenbing Wang| wangwenbin |
-
+|Sheng Wang| wangsheng |
+|Yuntao Li| liyuntao |
 
 ## Contributors
 
diff --git a/docs/zh/team/README.md b/docs/zh/team/README.md
index e836381..0039659 100755
--- a/docs/zh/team/README.md
+++ b/docs/zh/team/README.md
@@ -5,40 +5,35 @@ SkyWalking团队由孵化器项目管理委员会成员(以下简称“成员
 ## 成员
 成员包括孵化器项目管理委员会、提交者、Skywalking项目导师。
 
-### 孵化导师
-| 名字 |Apache ID|
-:---:|:--:|
-|Ignasi Barrera| nacx |
-|Luke Han| lukehan |
-|Michael Semb Wever| mck |
-|Willem Ning Jiang| ningjiang |
-
-### 孵化器项目管理委员会
+### 项目管理委员会
 | 名字 |Apache ID|
 :---:|:--:|
+|Can Li| lican |
 |DongXue Si| ilucky |
 |Haoyang Liu| liuhaoyangzz |
 |Hongtao Gao| hanahmily |
+|Ignasi Barrera| nacx |
 |Jian Tan| tanjian |
-|Sheng Wang| wangsheng |
 |Sheng Wu| wusheng |
 |Shinn Zhang| zhangxin |
 |Kai Wang| wangkai |
+|Michael Semb Wever| mck |
+|Jiaqi Lin| linjiaqi |
+|Jinlin Fu| withlin |
+|Lang Li| lilang |
+|Wenbing Wang| wangwenbin |
+|Willem Ning Jiang| ningjiang |
 |Yang Bai| baiyang |
 |Yao Wang| ywang |
+|Yixiong Cao| caoyixiong |
 |Yongsheng Peng| pengys |
-|Yuntao Li| liyuntao |
 |Zhang Kewei| zhangkewei |
 
 ### 提交者
 | 名字 |Apache ID|
 |:---:|:--:|
-|Can Li| lican |
-|Jiaqi Lin| linjiaqi |
-|Jinlin Fu| withlin |
-|Lang Li| lilang |
-|Yixiong Cao| caoyixiong |
-|Wenbing Wang| wangwenbin |
+|Sheng Wang| wangsheng |
+|Yuntao Li| liyuntao |
 
 ## 贡献者
 自从Skywalking使用Github之后,拥有了许多的贡献者,你可以在我们的存储库贡献列表中找到它们。