You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ta...@apache.org on 2017/06/06 05:39:01 UTC
[1/3] incubator-weex git commit: + [doc] add Users App
Repository: incubator-weex
Updated Branches:
refs/heads/dev 38c4bebb3 -> c72b23aee
+ [doc] add Users App
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0aa1a6e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0aa1a6e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0aa1a6e4
Branch: refs/heads/dev
Commit: 0aa1a6e495de39e2ef7f5222fbfaeb4d7d51fc38
Parents: 1c0d992
Author: tancy <ro...@gmail.com>
Authored: Tue Jun 6 12:00:24 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Tue Jun 6 12:00:24 2017 +0800
----------------------------------------------------------------------
doc/themes/weex/languages/cn.yml | 12 +++++++++
doc/themes/weex/languages/en.yml | 13 +++++++++-
doc/themes/weex/layout/index.ejs | 28 +++++++++++++++++++++
doc/themes/weex/source/css/index.scss | 17 ++++++++++++-
doc/themes/weex/source/images/fliggy.png | Bin 0 -> 19329 bytes
doc/themes/weex/source/images/juhuasuan.png | Bin 0 -> 46340 bytes
doc/themes/weex/source/images/qianniu.png | Bin 0 -> 19852 bytes
doc/themes/weex/source/images/taopiaopiao.png | Bin 0 -> 12460 bytes
8 files changed, 68 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0aa1a6e4/doc/themes/weex/languages/cn.yml
----------------------------------------------------------------------
diff --git a/doc/themes/weex/languages/cn.yml b/doc/themes/weex/languages/cn.yml
index 23b209a..5c87cc1 100644
--- a/doc/themes/weex/languages/cn.yml
+++ b/doc/themes/weex/languages/cn.yml
@@ -50,6 +50,18 @@ index:
youku:
title: 优酷
content: 中国领先的视频服务平台，提供视频播放，视频发布，视频分享等服务。
+ taopiaopiao:
+ title: 淘票票
+ content: 淘票票专业版是一款为电影人提供有价值数据的产品。通过和阿里海量用户数据相结合，为电影人提供了秒级实时票房、排片、影院经营、上映日历和用户画像等数据服务。
+ fliggy:
+ title: 飞猪
+ content: 飞猪是阿里巴巴集团旗下旅行品牌，旨在为用户提供便捷、更高性价比的出行服务。
+ juhuasuan:
+ title: 聚划算
+ content: 聚划算是阿里巴巴集团旗下平台，供淘宝、天猫商家从8亿商品中精挑细选优质商品，自主开展网络精选特卖活动，以更高的服务标准为你提供高性价比的商品。
+ qianniu:
+ title: 千牛
+ content: 阿里巴巴官方出品的卖家移动工作台，服务淘宝、天猫、1688、线下门店等众多商家用户，商家管店必备。
feedback:
title: 他们说
user1:
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0aa1a6e4/doc/themes/weex/languages/en.yml
----------------------------------------------------------------------
diff --git a/doc/themes/weex/languages/en.yml b/doc/themes/weex/languages/en.yml
index 6eea9fd..8fadf37 100644
--- a/doc/themes/weex/languages/en.yml
+++ b/doc/themes/weex/languages/en.yml
@@ -50,7 +50,18 @@ index:
youku:
title: Youku
content: Youku is one of China's top online video and streaming service platforms.
-
+ taopiaopiao:
+ title: Tao Tickets Pro
+ content: Tao Tickets Pro is a product for the film to provide valuable data. Through the combination of Ali and the amount of user data, for the film people to provide a second real-time box office, film, theater business, release calendar and user portraits and other data services.
+ fliggy:
+ title: Fliggy
+ content: Fliggy is Alibaba Group's travel brand, designed to provide users with convenient, more cost-effective travel services.
+ juhuasuan:
+ title: Juhuasuan
+ content: Juhuasuan is Alibaba Group's platform for Taobao, Lynx business from 800 million commodities in the carefully selected high-quality goods, independent network to carry out activities to sell, with higher service standards to provide you with cost-effective goods.
+ qianniu:
+ title: Qianniu
+ content: Alibaba produced for the seller stop working units, for the seller the integration of the shop management tools, business information and news, business partnerships, in order to enhance the operational efficiency of the sellers, in order to promote cooperation between the two win, so that the seller can...
feedback:
title: People say
user1:
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0aa1a6e4/doc/themes/weex/layout/index.ejs
----------------------------------------------------------------------
diff --git a/doc/themes/weex/layout/index.ejs b/doc/themes/weex/layout/index.ejs
index 01c964a..4a1ad87 100644
--- a/doc/themes/weex/layout/index.ejs
+++ b/doc/themes/weex/layout/index.ejs
@@ -184,6 +184,34 @@
<p><%= _p('index.users.youku.content') %></p>
</div>
</div>
+ <div class="user-logo taopiaopiao-logo">
+ <h3><%= _p('index.users.taopiaopiao.title') %></h3>
+ <div class="user-info">
+ <h4><%= _p('index.users.taopiaopiao.title') %></h4>
+ <p><%= _p('index.users.taopiaopiao.content') %></p>
+ </div>
+ </div>
+ <div class="user-logo fliggy-logo">
+ <h3><%= _p('index.users.fliggy.title') %></h3>
+ <div class="user-info">
+ <h4><%= _p('index.users.fliggy.title') %></h4>
+ <p><%= _p('index.users.fliggy.content') %></p>
+ </div>
+ </div>
+ <div class="user-logo juhuasuan-logo">
+ <h3><%= _p('index.users.juhuasuan.title') %></h3>
+ <div class="user-info">
+ <h4><%= _p('index.users.juhuasuan.title') %></h4>
+ <p><%= _p('index.users.juhuasuan.content') %></p>
+ </div>
+ </div>
+ <div class="user-logo qianniu-logo">
+ <h3><%= _p('index.users.qianniu.title') %></h3>
+ <div class="user-info">
+ <h4><%= _p('index.users.qianniu.title') %></h4>
+ <p><%= _p('index.users.qianniu.content') %></p>
+ </div>
+ </div>
</div>
<!--<div class="more">
<a class="more" href="">More</a>
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0aa1a6e4/doc/themes/weex/source/css/index.scss
----------------------------------------------------------------------
diff --git a/doc/themes/weex/source/css/index.scss b/doc/themes/weex/source/css/index.scss
index 8eb4e76..7b5454f 100644
--- a/doc/themes/weex/source/css/index.scss
+++ b/doc/themes/weex/source/css/index.scss
@@ -426,11 +426,26 @@
background: $bg-light-blue url("../images/youku.png") 50% 50% / 64px 64px no-repeat;
background-origin: content-box;
}
-
.ding-logo {
background: $bg-light-blue url("../images/ding.png") 50% 50% / 64px 64px no-repeat;
background-origin: content-box;
}
+ .taopiaopiao-logo {
+ background: $bg-light-blue url("../images/taopiaopiao.png") 50% 50% / 64px 64px no-repeat;
+ background-origin: content-box;
+ }
+ .fliggy-logo {
+ background: $bg-light-blue url("../images/fliggy.png") 50% 50% / 64px 64px no-repeat;
+ background-origin: content-box;
+ }
+ .juhuasuan-logo {
+ background: $bg-light-blue url("../images/juhuasuan.png") 50% 50% / 64px 64px no-repeat;
+ background-origin: content-box;
+ }
+ .qianniu-logo {
+ background: $bg-light-blue url("../images/qianniu.png") 50% 50% / 64px 64px no-repeat;
+ background-origin: content-box;
+ }
}
.user-info {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0aa1a6e4/doc/themes/weex/source/images/fliggy.png
----------------------------------------------------------------------
diff --git a/doc/themes/weex/source/images/fliggy.png b/doc/themes/weex/source/images/fliggy.png
new file mode 100644
index 0000000..5f290bb
Binary files /dev/null and b/doc/themes/weex/source/images/fliggy.png differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0aa1a6e4/doc/themes/weex/source/images/juhuasuan.png
----------------------------------------------------------------------
diff --git a/doc/themes/weex/source/images/juhuasuan.png b/doc/themes/weex/source/images/juhuasuan.png
new file mode 100644
index 0000000..948807d
Binary files /dev/null and b/doc/themes/weex/source/images/juhuasuan.png differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0aa1a6e4/doc/themes/weex/source/images/qianniu.png
----------------------------------------------------------------------
diff --git a/doc/themes/weex/source/images/qianniu.png b/doc/themes/weex/source/images/qianniu.png
new file mode 100644
index 0000000..138ae03
Binary files /dev/null and b/doc/themes/weex/source/images/qianniu.png differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0aa1a6e4/doc/themes/weex/source/images/taopiaopiao.png
----------------------------------------------------------------------
diff --git a/doc/themes/weex/source/images/taopiaopiao.png b/doc/themes/weex/source/images/taopiaopiao.png
new file mode 100644
index 0000000..ed52a66
Binary files /dev/null and b/doc/themes/weex/source/images/taopiaopiao.png differ
[3/3] incubator-weex git commit: Merge branch 'dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into dev
Posted by ta...@apache.org.
Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c72b23ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c72b23ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c72b23ae
Branch: refs/heads/dev
Commit: c72b23aee30fd898d9764b506d8580e4c40afb2e
Parents: 648e272 38c4beb
Author: tancy <ro...@gmail.com>
Authored: Tue Jun 6 13:38:06 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Tue Jun 6 13:38:06 2017 +0800
----------------------------------------------------------------------
.../cn/v-0.10/references/components/input.md | 216 +++++++++++++++--
doc/source/references/components/input.md | 231 +++++++++++++++----
2 files changed, 381 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-weex git commit: * [doc] update user App content
Posted by ta...@apache.org.
* [doc] update user App content
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/648e272c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/648e272c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/648e272c
Branch: refs/heads/dev
Commit: 648e272cdc3c811046ac1139b56b38c96b04c933
Parents: 0aa1a6e
Author: tancy <ro...@gmail.com>
Authored: Tue Jun 6 13:33:31 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Tue Jun 6 13:33:31 2017 +0800
----------------------------------------------------------------------
doc/themes/weex/languages/en.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/648e272c/doc/themes/weex/languages/en.yml
----------------------------------------------------------------------
diff --git a/doc/themes/weex/languages/en.yml b/doc/themes/weex/languages/en.yml
index 8fadf37..dae9090 100644
--- a/doc/themes/weex/languages/en.yml
+++ b/doc/themes/weex/languages/en.yml
@@ -52,7 +52,7 @@ index:
content: Youku is one of China's top online video and streaming service platforms.
taopiaopiao:
title: Tao Tickets Pro
- content: Tao Tickets Pro is a product for the film to provide valuable data. Through the combination of Ali and the amount of user data, for the film people to provide a second real-time box office, film, theater business, release calendar and user portraits and other data services.
+ content: Tao Tickets Pro is an intelligent data application which offers film industry practitioners with valuable data and information. Base on the huge data from Alibaba group, it provides services of realtime box office statistic and prediction，film schedule , cinema management information and user profile etc.
fliggy:
title: Fliggy
content: Fliggy is Alibaba Group's travel brand, designed to provide users with convenient, more cost-effective travel services.