Merge branch 'dev' into 0.16-dev
Conflicts:
doc/source/cn/references/weex-variable.md
doc/source/references/weex-variable.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f102f3fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f102f3fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f102f3fe
Branch: refs/heads/0.16-dev
Commit: f102f3fe1f08541ba34190c2b8f0f8185a10a553
Parents: da56268 8a5e0ee
Author: cxfeng <[email protected]>
Authored: Thu Jul 20 15:21:07 2017 +0800
Committer: cxfeng <[email protected]>
Committed: Thu Jul 20 15:21:07 2017 +0800
----------------------------------------------------------------------
doc/_config.yml | 6 +-
doc/_config_cn.yml | 6 +-
doc/source/_posts/coreml.md | 79 ++++++++++++++++++++
doc/source/_posts/hello_world.md | 3 +-
doc/source/_posts/test.md | 14 ++++
.../cn/references/advanced/extend-to-android.md | 15 +++-
doc/source/cn/references/bubble.md | 4 +-
doc/source/cn/references/common-style.md | 4 +-
doc/source/cn/references/components/image.md | 2 +-
doc/source/cn/references/components/input.md | 34 +++++----
doc/source/cn/references/components/list.md | 8 +-
doc/source/cn/references/components/scroller.md | 2 +-
doc/source/cn/references/weex-variable.md | 2 +-
doc/source/cn/v-0.10/references/bubble.md | 6 +-
doc/source/guide/intro/write-once.md | 14 ++--
doc/source/guide/set-up-env.md | 22 +++---
.../references/advanced/extend-to-android.md | 14 ++++
doc/source/references/bubble.md | 4 +-
doc/source/references/components/image.md | 2 +-
doc/source/references/components/input.md | 34 +++++----
doc/source/references/components/list.md | 7 +-
doc/source/references/components/scroller.md | 4 +-
doc/source/v-0.10/references/bubble.md | 8 +-
doc/themes/weex/languages/cn.yml | 5 +-
doc/themes/weex/languages/en.yml | 3 +-
doc/themes/weex/layout/_partial/footer.ejs | 2 +-
doc/themes/weex/layout/_partial/header.ejs | 23 +++---
.../weex/layout/_partial/post/summary.ejs | 6 ++
doc/themes/weex/layout/_partial/slider.ejs | 2 +-
doc/themes/weex/layout/layout.ejs | 6 +-
doc/themes/weex/source/css/index.scss | 2 +
doc/themes/weex/source/css/partial/footer.scss | 5 +-
doc/themes/weex/source/css/partial/summary.scss | 6 ++
doc/themes/weex/source/js/common.js | 38 ++++++++++
34 files changed, 286 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f102f3fe/doc/source/cn/references/weex-variable.md
----------------------------------------------------------------------
diff --cc doc/source/cn/references/weex-variable.md
index 0de2b37,0848441..ac2c332
--- a/doc/source/cn/references/weex-variable.md
+++ b/doc/source/cn/references/weex-variable.md
@@@ -19,8 -19,7 +19,8 @@@ has_chapter_content: tru
* `weexVersion: string`: Weex sdk çæ¬ã
* `appName: string`: åºç¨ååã
* `appVersion: string`: åºç¨çæ¬ã
- * `platform: string`: å¹³å°ä¿¡æ¯ï¼æ¯ 'iOS'ã'android' è¿æ¯ 'Web'ã
+ * `platform: string`: å¹³å°ä¿¡æ¯ï¼æ¯ iOSãAndroid è¿æ¯ Webã
- + `osName: string`: iOSæè
androidï¼è¡¨ç¤ºæä½ç³»ç»çå称.
++ * `osName: string`: iOSæè
androidï¼è¡¨ç¤ºæä½ç³»ç»çå称.
* `osVersion: string`: ç³»ç»çæ¬ã
* `deviceModel: string`: 设å¤åå· (ä»
åçåºç¨)ã
* `deviceWidth: number`: 设å¤å®½åº¦ãWeex é»è®¤ä»¥å®½åº¦ä¸º 750px
åéé
渲æï¼è¦è·å¾750pxä¸çå±å¹é«åº¦ï¼å¯ä»¥éè¿ `height =
750/deviceWidth*deviceHeight` å
¬å¼è·å¾ï¼å¯ä»¥ä½¿ç¨å° CSS
ä¸ï¼ç¨æ¥è®¾ç½®å
¨å±å°ºå¯¸
