You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ha...@apache.org on 2018/03/01 07:03:08 UTC
[1/7] incubator-weex-site git commit: Update users.yml
Repository: incubator-weex-site
Updated Branches:
refs/heads/master b798c3bfc -> 5ebe02481
Update users.yml
mod sinazc ios address
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/commit/d3933786
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/d3933786
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/d3933786
Branch: refs/heads/master
Commit: d393378666ed7870393a0bd4c74ae45101871a2e
Parents: b798c3b
Author: 唐荣尧 <97...@qq.com>
Authored: Thu Mar 1 10:17:38 2018 +0800
Committer: GitHub <no...@github.com>
Committed: Thu Mar 1 10:17:38 2018 +0800
----------------------------------------------------------------------
source/_data/users.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/d3933786/source/_data/users.yml
----------------------------------------------------------------------
diff --git a/source/_data/users.yml b/source/_data/users.yml
index 4179a0c..93e9914 100644
--- a/source/_data/users.yml
+++ b/source/_data/users.yml
@@ -126,7 +126,7 @@ qiang100:
sinazc:
name: '新浪众测'
icon: 'http://n.sinaimg.cn/tech/zcapp/zhongce_3x.png'
- iOS: 'https://itunes.apple.com/cn/app/%E6%96%B0%E6%B5%AA%E4%BC%97%E6%B5%8B/id1309407290?l=zh&ls=1&mt=8'
+ iOS: 'https://itunes.apple.com/cn/app/id1309407290?mt=8'
android: ''
bandou:
name: '班豆'
[7/7] incubator-weex-site git commit: Update who-is-using-weex style
to support download link (#87)
Posted by ha...@apache.org.
Update who-is-using-weex style to support download link (#87)
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/commit/5ebe0248
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/5ebe0248
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/5ebe0248
Branch: refs/heads/master
Commit: 5ebe024811728a17aff7f09f87cb9a826f770569
Parents: 9aa3e74 3209f4c
Author: Hanks <zh...@gmail.com>
Authored: Thu Mar 1 15:02:44 2018 +0800
Committer: Hanks <zh...@gmail.com>
Committed: Thu Mar 1 15:02:44 2018 +0800
----------------------------------------------------------------------
package.json | 4 +--
themes/weex/layout/who-is-using-weex.ejs | 11 ++++++--
themes/weex/source/css/index.scss | 36 +++++++++++++++++++++++-
themes/weex/source/css/media-queries.scss | 20 +++++++++++++
themes/weex/source/images/android-icon.png | Bin 0 -> 1043 bytes
themes/weex/source/images/ios-icon.png | Bin 0 -> 1323 bytes
6 files changed, 65 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[5/7] incubator-weex-site git commit: delete redundant English
original (#85)
Posted by ha...@apache.org.
delete redundant English original (#85)
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/commit/177a5cb3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/177a5cb3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/177a5cb3
Branch: refs/heads/master
Commit: 177a5cb32a4fa0917f4c5d79c68f119db97967e8
Parents: 8537bcf 34e2dce
Author: Hanks <zh...@gmail.com>
Authored: Thu Mar 1 15:00:42 2018 +0800
Committer: Hanks <zh...@gmail.com>
Committed: Thu Mar 1 15:00:42 2018 +0800
----------------------------------------------------------------------
source/cn/tools/toolkit.md | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
[4/7] incubator-weex-site git commit: Update who-is-using-weex style
to support download link
Posted by ha...@apache.org.
Update who-is-using-weex style to support download link
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/commit/3209f4ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/3209f4ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/3209f4ce
Branch: refs/heads/master
Commit: 3209f4ce1f0777377572b20eac448d3e1123312b
Parents: b798c3b
Author: erha19 <fa...@gmail.com>
Authored: Thu Mar 1 13:55:01 2018 +0800
Committer: erha19 <fa...@gmail.com>
Committed: Thu Mar 1 13:55:01 2018 +0800
----------------------------------------------------------------------
package.json | 4 +--
themes/weex/layout/who-is-using-weex.ejs | 11 ++++++--
themes/weex/source/css/index.scss | 36 +++++++++++++++++++++++-
themes/weex/source/css/media-queries.scss | 20 +++++++++++++
themes/weex/source/images/android-icon.png | Bin 0 -> 1043 bytes
themes/weex/source/images/ios-icon.png | Bin 0 -> 1323 bytes
6 files changed, 65 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/3209f4ce/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index c38816e..901dcf2 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"version": "0.0.0",
"private": true,
"hexo": {
- "version": "3.5.0"
+ "version": "3.4.4"
},
"scripts": {
"server": "hexo server",
@@ -30,4 +30,4 @@
"hexo-toc": "^1.1.0",
"uglify-js": "^3.3.7"
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/3209f4ce/themes/weex/layout/who-is-using-weex.ejs
----------------------------------------------------------------------
diff --git a/themes/weex/layout/who-is-using-weex.ejs b/themes/weex/layout/who-is-using-weex.ejs
index 01c45d5..684cf42 100644
--- a/themes/weex/layout/who-is-using-weex.ejs
+++ b/themes/weex/layout/who-is-using-weex.ejs
@@ -5,6 +5,14 @@
<% for (var user in site.data.users) { %>
<li>
+ <div class="download-btn">
+ <a class="android" href="<%= site.data.users[user].android || '#' %>">
+
+ </a>
+ <a class="ios" href="<%= site.data.users[user].iOS || '#' %>">
+
+ </a>
+ </div>
<div class="img" style="background-image:url(<%= site.data.users[user].icon %>)"></div>
<div class="tooltip"><%= site.data.users[user].name %></div>
</li>
@@ -12,9 +20,6 @@
</ul>
<a class="addmore" href="https://github.com/apache/incubator-weex-site/tree/master/source/_data/users.yml" target="_blank">
<%= _p('index.addmore') %>
- <span class="top"></span>
- <span class="left"></span>
- <span class="right"></span>
<span class="bottom"></span>
</a>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/3209f4ce/themes/weex/source/css/index.scss
----------------------------------------------------------------------
diff --git a/themes/weex/source/css/index.scss b/themes/weex/source/css/index.scss
index f500310..323bb40 100644
--- a/themes/weex/source/css/index.scss
+++ b/themes/weex/source/css/index.scss
@@ -379,7 +379,35 @@
}
.users {
- $color: #333;
+ $color: rgb(88, 87, 87);
+ li {
+ position: relative;
+ }
+ .download-btn {
+ width: 90px;
+ height: 30px;
+ position: absolute;
+ border-radius: 0 0 15px 15px;
+ bottom: 30px;
+ left: 20px;
+ opacity: 0;
+ transition: all .2s ease;
+ background: rgba(0,0,0,.5);
+ a {
+ display: block;
+ width: 50%;
+ height: 100%;
+ float:left;
+ }
+ .android {
+ background: url(../images/android-icon.png) center center no-repeat;
+ background-size: 24px 24px;
+ }
+ .ios {
+ background: url(../images/ios-icon.png) center center no-repeat;
+ background-size: 24px 24px;
+ }
+ }
.addmore {
padding: 15px 15px;
font-size: 26px;
@@ -437,6 +465,11 @@
transform: translateY(-2px);
box-shadow: 0 8px 16px rgba(0,0,0,.16);
}
+ .download-btn{
+ opacity: 1;
+ transform: translateY(-2px);
+ z-index: 999;
+ }
}
}
.tooltip{
@@ -455,6 +488,7 @@
transition: box-shadow .2s ease,transform .2s ease;
vertical-align: middle;
border-radius: 15px;
+ background-color: transparent;
background-size: 90px 90px;
background-position: center center;
cursor: pointer;
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/3209f4ce/themes/weex/source/css/media-queries.scss
----------------------------------------------------------------------
diff --git a/themes/weex/source/css/media-queries.scss b/themes/weex/source/css/media-queries.scss
index 2e81948..8a4c929 100644
--- a/themes/weex/source/css/media-queries.scss
+++ b/themes/weex/source/css/media-queries.scss
@@ -187,6 +187,26 @@
.title {
font-size: 18px;
}
+ .download-btn {
+ width: 60px;
+ height: 60px;
+ border-radius: 10px;
+ top: 5px;
+ left: 5px;
+ a {
+ width: 100%;
+ height: 30px;
+ float:none;
+ }
+ .android {
+ background: url(../images/android-icon.png) center center no-repeat;
+ background-size: 24px 24px;
+ }
+ .ios {
+ background: url(../images/ios-icon.png) center center no-repeat;
+ background-size: 24px 24px;
+ }
+ }
.app-listing {
margin-top: 0;
li{
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/3209f4ce/themes/weex/source/images/android-icon.png
----------------------------------------------------------------------
diff --git a/themes/weex/source/images/android-icon.png b/themes/weex/source/images/android-icon.png
new file mode 100644
index 0000000..21079d6
Binary files /dev/null and b/themes/weex/source/images/android-icon.png differ
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/3209f4ce/themes/weex/source/images/ios-icon.png
----------------------------------------------------------------------
diff --git a/themes/weex/source/images/ios-icon.png b/themes/weex/source/images/ios-icon.png
new file mode 100644
index 0000000..28f0aef
Binary files /dev/null and b/themes/weex/source/images/ios-icon.png differ
[6/7] incubator-weex-site git commit: Update users.yml (#83)
Posted by ha...@apache.org.
Update users.yml (#83)
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/commit/9aa3e746
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/9aa3e746
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/9aa3e746
Branch: refs/heads/master
Commit: 9aa3e746eac3a6a59055d5ecfcf322374b12f0db
Parents: 177a5cb d393378
Author: Hanks <zh...@gmail.com>
Authored: Thu Mar 1 15:01:59 2018 +0800
Committer: Hanks <zh...@gmail.com>
Committed: Thu Mar 1 15:01:59 2018 +0800
----------------------------------------------------------------------
source/_data/users.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/7] incubator-weex-site git commit: correct the href of the link
named "common events"
Posted by ha...@apache.org.
correct the href of the link named "common events"
the old href is wrong, which causes a 404 error.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/commit/8537bcfd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/8537bcfd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/8537bcfd
Branch: refs/heads/master
Commit: 8537bcfd2cd044771098254b91fa09bafa83c49e
Parents: b798c3b
Author: Albert <al...@163.com>
Authored: Thu Mar 1 11:01:09 2018 +0800
Committer: GitHub <no...@github.com>
Committed: Thu Mar 1 11:01:09 2018 +0800
----------------------------------------------------------------------
source/cn/wiki/platform-difference.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/8537bcfd/source/cn/wiki/platform-difference.md
----------------------------------------------------------------------
diff --git a/source/cn/wiki/platform-difference.md b/source/cn/wiki/platform-difference.md
index db19820..482dca9 100644
--- a/source/cn/wiki/platform-difference.md
+++ b/source/cn/wiki/platform-difference.md
@@ -22,7 +22,7 @@ DOM（Document Object Model），即文档对象模型，是 HTML 和 XML 文档
Weex 支持在标签上绑定事件，和在浏览器中的写法一样，但是 Weex 中的事件是由原生组件捕获并触发的，行为和浏览器中有所不同，事件中的属性也和 Web 中有差异。
-+ 并不支持 Web 中所有的事件类型，详情请参考[《通用事件》](./common-event.html)。
++ 并不支持 Web 中所有的事件类型，详情请参考[《通用事件》](./common-events.html)。
+ 不区分事件的捕获阶段和冒泡阶段，相当于 DOM 0 级事件。
## Weex 环境中没有 BOM
[3/7] incubator-weex-site git commit: delete redundant English
original
Posted by ha...@apache.org.
delete redundant English original
delete the original which is ignored in translation, and complete the corresponding words in Chinese
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/commit/34e2dcee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/34e2dcee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/34e2dcee
Branch: refs/heads/master
Commit: 34e2dcee71460e2feaa1d4d603c589879c01ccb2
Parents: b798c3b
Author: Albert <al...@163.com>
Authored: Thu Mar 1 11:31:10 2018 +0800
Committer: GitHub <no...@github.com>
Committed: Thu Mar 1 11:31:10 2018 +0800
----------------------------------------------------------------------
source/cn/tools/toolkit.md | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/34e2dcee/source/cn/tools/toolkit.md
----------------------------------------------------------------------
diff --git a/source/cn/tools/toolkit.md b/source/cn/tools/toolkit.md
index 925412f..20fdaca 100644
--- a/source/cn/tools/toolkit.md
+++ b/source/cn/tools/toolkit.md
@@ -43,8 +43,7 @@ $ weex create username/repo my-project
### preview
-weex-toolkit supports previewing your Weex file(`.we` or `.vue`) in a watch mode. You only need specify your file path.
-weex-toolkit工具支持对你的Weex文件（`.vue`)在监听模式下进行预览，你只需要指定一下你的项目路径。
+weex-toolkit工具支持对你的Weex文件（`.we`或`.vue`)在监听模式下进行预览，你只需要指定一下你的项目路径。
自`weex-toolkit v1.1.0+`版本后修改
``` bash