You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by GitBox <gi...@apache.org> on 2018/12/22 04:05:36 UTC
[GitHub] TinyAllen closed pull request #18: Update: update homepage event &
fix bug.
TinyAllen closed pull request #18: Update: update homepage event & fix bug.
URL: https://github.com/apache/incubator-skywalking-website/pull/18
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/docs/.vuepress/theme/layouts/Home.vue b/docs/.vuepress/theme/layouts/Home.vue
index 6104572..b5773a1 100755
--- a/docs/.vuepress/theme/layouts/Home.vue
+++ b/docs/.vuepress/theme/layouts/Home.vue
@@ -48,12 +48,31 @@
</tr>
</table>
</div>
- <div class="home-card-news clear">
+ <div class="home-card-news">
<h1 class="tc">{{data.news.title}}</h1>
- <div class="home-card-news-item" v-for="i in data.news.content">
- <h4 class="mb10 mt0">{{i.header}}</h4>
- <div class="sm mb10"><span style="color:#999;margin-right:10px">{{i.time}}</span></div>
- <p class="mt0">{{i.content}}</p>
+ <div class="clear">
+ <div class="home-card-news-item">
+ <h4 class="mb10 mt0">{{data.news.content[0].header}}</h4>
+ <div class="sm mb10"><span style="color:#999;margin-right:10px">{{data.news.content[0].time}}</span></div>
+ <p class="mt0">{{data.news.content[0].content}}</p>
+ </div>
+ <div class="home-card-news-item">
+ <h4 class="mb10 mt0">{{data.news.content[1].header}}</h4>
+ <div class="sm mb10"><span style="color:#999;margin-right:10px">{{data.news.content[1].time}}</span></div>
+ <p class="mt0">{{data.news.content[1].content}}</p>
+ </div>
+ </div>
+ <div class="clear">
+ <div class="home-card-news-item">
+ <h4 class="mb10 mt0">{{data.news.content[2].header}}</h4>
+ <div class="sm mb10"><span style="color:#999;margin-right:10px">{{data.news.content[2].time}}</span></div>
+ <p class="mt0">{{data.news.content[2].content}}</p>
+ </div>
+ <div class="home-card-news-item">
+ <h4 class="mb10 mt0">{{data.news.content[3].header}}</h4>
+ <div class="sm mb10"><span style="color:#999;margin-right:10px">{{data.news.content[3].time}}</span></div>
+ <p class="mt0">{{data.news.content[3].content}}</p>
+ </div>
</div>
</div>
<div class="home-card-user tc">
@@ -93,6 +112,7 @@ export default {
</script>
<style>
+.clear:after{display:table; content:''; clear:both;}
.incubating{
font-size: 18px;vertical-align: top;
position: relative;
diff --git a/docs/README.md b/docs/README.md
index a6ee828..568f177 100755
--- a/docs/README.md
+++ b/docs/README.md
@@ -25,6 +25,9 @@ user:
news:
title: Events & News
content:
+ - header: Welcome Yao Wang as a new PPMC.
+ content: Based on his contributions. Including created RocketBot as our secondary UI, new website and very cool trace view page in next release. he has been accepted as SkyWalking PPMC. Welcome aboard.
+ time: Dec. 22th, 2018
- header: Welcome Yixiong Cao as a new committer.
content: Based on his contributions to the project, he has been accepted as SkyWalking committer. Welcome aboard.
time: Dec. 10th, 2018
@@ -34,8 +37,4 @@ news:
- header: Welcome Jian Tan as a new committer.
content: Based on his contributions to the project, he has been accepted as SkyWalking committer. Welcome aboard.
time: Dec. 2rd, 2018
- - header: Release Apache SkyWalking APM 6.0.0-alpha
- content: APM consistently compatible in language agent(Java, .Net, NodeJS), 3rd party format(Zipkin) and service mesh telemetry(Istio)
- time: Nov. 14th, 2018
- tags: SkyWalking APM, Observalibity Analysis Platform, New Release
---
diff --git a/docs/zh/README.md b/docs/zh/README.md
index 824d251..b51bd5b 100755
--- a/docs/zh/README.md
+++ b/docs/zh/README.md
@@ -26,6 +26,9 @@ user:
news:
title: 事件 & 新闻
content:
+ - header: 欢迎王垚成为PPMC
+ content: 根据他的贡献，包括制作了RocketBot作为我们的第二套UI, 新的Skywalking官网和下一版本中非常酷的链路追踪页面.他已被接纳为SkyWalking PPMC。欢迎。
+ time: 2018年12月22日
- header: 欢迎曹奕雄成为committer
content: 根据他对该项目的贡献，他已被接纳为SkyWalking提交者。欢迎。
time: 2018年12月10日
@@ -35,8 +38,4 @@ news:
- header: 欢迎谭建成为committer
content: 根据他对该项目的贡献，他已被接纳为SkyWalking提交者。欢迎。
time: 2018年12月2日
- - header: 发布Apache SkyWalking 6.0.0-alpha版本
- content: APM始终兼容多语言探针（Java，.Net，NodeJS）、第三方追踪数据格式（Zipkin）和服务网格遥测数据（Istio）。
- time: 2018年11月14日
- tags: SkyWalking APM, Observalibity Analysis Platform, New Release
---
diff --git a/docs/zh/events/README.md b/docs/zh/events/README.md
index d8a8a3e..b88415a 100755
--- a/docs/zh/events/README.md
+++ b/docs/zh/events/README.md
@@ -2,7 +2,7 @@
## 欢迎王垚成为PPMC
###### 2018年12月22日
-根据他的贡献，包括制作了[RocketBot](https://github.com/TinyAllen/rocketbot)作为我们的第二套UI, 新的[网站](http://skywalking.apache.org/) 和非常酷的链路追踪页面.他已被接纳为SkyWalking PPMC。欢迎。
+根据他的贡献，包括制作了[RocketBot](https://github.com/TinyAllen/rocketbot)作为我们的第二套UI, 新的[Skywalking官网](http://skywalking.apache.org/) 和下一版本中非常酷的链路追踪页面.他已被接纳为SkyWalking PPMC。欢迎。
## 欢迎曹奕雄成为committer
###### 2018年12月10日
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services