Merge branch 'master' of https://github.com/apache/incubator-weex-site


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/aaf57d5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/tree/aaf57d5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex-site/diff/aaf57d5e

Branch: refs/heads/master
Commit: aaf57d5e26a18c43ef953629cf95f8bb2239a82b
Parents: 53d37f0 fd30959
Author: miomin <[email protected]>
Authored: Thu Jan 18 14:59:01 2018 +0800
Committer: miomin <[email protected]>
Committed: Thu Jan 18 14:59:01 2018 +0800

----------------------------------------------------------------------
 _config.yml                                     |   38 +-
 _config_cn.yml                                  |   68 +-
 _drafts/difference-with-web.en.md               |    4 +-
 _drafts/extend-js-framework.md                  |  168 ++
 _drafts/extend-to-android.md                    |  175 ++
 _drafts/sandbox.md                              |   36 +
 _drafts/using-vue.md                            |   59 +
 advanced/extend-to-android.md                   |  175 --
 package-lock.json                               | 1989 ++++++++++++++----
 package.json                                    |   10 +-
 source/bug-report-guidelines.md                 |   66 +
 source/cn/bug-report-guidelines.md              |   59 +
 source/cn/contributing.md                       |  102 +-
 source/cn/development-process.md                |   94 +
 .../guide/advanced/use-vuex-and-vue-router.md   |    6 +-
 source/cn/guide/extend-android.md               |  106 +-
 source/cn/guide/extend-web-render.md            |   35 +-
 source/cn/guide/front-end-frameworks.md         |   23 +-
 source/cn/guide/index.md                        |  190 +-
 source/cn/guide/integrate-devtool-to-android.md |    7 +-
 source/cn/guide/integrate-to-your-app.md        |   90 +-
 source/cn/guide/use-vue.md                      |   11 +
 source/cn/references/broadcast-channel.md       |  113 +
 source/cn/references/components/a.md            |   88 +-
 source/cn/references/components/cell.md         |   64 +-
 source/cn/references/components/div.md          |    2 +-
 source/cn/references/components/image.md        |  245 +--
 source/cn/references/components/indicator.md    |   91 +-
 source/cn/references/components/input.md        |   15 +-
 source/cn/references/components/list.md         |   66 +-
 source/cn/references/components/scroller.md     |    2 +-
 source/cn/references/components/slider.md       |    2 +-
 source/cn/references/components/switch.md       |  145 +-
 source/cn/references/components/text.md         |    2 +-
 source/cn/references/components/textarea.md     |    2 +-
 source/cn/references/components/waterfall.md    |    2 +-
 source/cn/references/components/web.md          |  190 +-
 source/cn/references/index.md                   |    9 +
 source/cn/references/js-framework-apis.md       |   67 -
 source/cn/references/modules/animation.md       |  132 +-
 source/cn/references/modules/clipboard.md       |    2 +-
 source/cn/references/modules/dom.md             |  255 +--
 source/cn/references/modules/globalevent.md     |    2 +-
 source/cn/references/modules/meta.md            |    2 +-
 source/cn/references/modules/modal.md           |    2 +-
 source/cn/references/modules/navigator.md       |    2 +-
 source/cn/references/modules/picker.md          |    2 +-
 source/cn/references/modules/stream.md          |    2 +-
 source/cn/references/modules/websocket.md       |    6 +-
 source/cn/references/modules/webview.md         |    2 +-
 source/cn/references/weex-variable.md           |  147 +-
 source/cn/tools/toolkit.md                      |  246 +--
 source/cn/wiki/gestures.md                      |    1 +
 source/cn/wiki/images/css-boxmodel.png          |  Bin 0 -> 12581 bytes
 source/cn/wiki/images/css-flexbox-align.jpg     |  Bin 0 -> 35005 bytes
 source/cn/wiki/images/css-flexbox-justify.svg   |   59 +
 source/cn/wiki/images/css-flexbox-sample.png    |  Bin 0 -> 3210 bytes
 source/cn/wiki/images/nav.png                   |  Bin 0 -> 83497 bytes
 source/contributing.md                          |   97 +-
 source/development-process.md                   |   93 +
 .../guide/advanced/use-vuex-and-vue-router.md   |   18 +-
 source/guide/create-a-plugin.md                 |  131 ++
 source/guide/extend-android.md                  |  257 +--
 source/guide/extend-ios.md                      |    2 +-
 source/guide/extend-js-framework.md             |    2 +-
 source/guide/extend-web-render.md               |   39 +-
 source/guide/front-end-frameworks.md            |   27 +-
 source/guide/images/different-switch.png        |  Bin 0 -> 29228 bytes
 source/guide/images/toolkit-preview.png         |  Bin 0 -> 180414 bytes
 source/guide/index.md                           |  126 +-
 source/guide/integrate-devtool-to-android.md    |    7 +-
 source/guide/integrate-to-your-app.md           |  225 +-
 source/guide/set-up-env.md                      |   88 +-
 source/guide/use-vue.md                         |  268 +++
 source/guide/using-rax.md                       |    7 -
 source/guide/using-vue.md                       |   59 -
 source/references/broadcast-channel.md          |  113 +
 source/references/components/a.md               |   74 +-
 source/references/components/cell.md            |    6 +-
 source/references/components/div.md             |    2 +-
 source/references/components/image.md           |  221 +-
 source/references/components/index.md           |   24 +
 source/references/components/indicator.md       |   91 +-
 source/references/components/input.md           |   55 +-
 source/references/components/list.md            |  115 +-
 source/references/components/refresh.md         |    2 +-
 source/references/components/scroller.md        |   36 +-
 source/references/components/slider.md          |    2 +-
 source/references/components/switch.md          |  143 +-
 source/references/components/text.md            |    2 +-
 source/references/components/textarea.md        |    2 +-
 source/references/components/video.md           |    2 +-
 source/references/components/waterfall.md       |    2 +-
 source/references/components/web.md             |  181 +-
 source/references/images/BroadcastChannel.png   |  Bin 0 -> 50463 bytes
 .../references/images/image-resize-property.png |  Bin 0 -> 730054 bytes
 source/references/index.md                      |   14 +-
 source/references/js_framework-apis.md          |   67 -
 source/references/modules/animation.md          |  136 +-
 source/references/modules/clipboard.md          |    2 +-
 source/references/modules/dom.md                |  258 +--
 source/references/modules/globalevent.md        |    2 +-
 source/references/modules/index.md              |   20 +
 source/references/modules/meta.md               |    2 +-
 source/references/modules/modal.md              |    2 +-
 source/references/modules/navigator.md          |   24 +-
 source/references/modules/picker.md             |    2 +-
 source/references/modules/stream.md             |    2 +-
 source/references/modules/websocket.md          |    6 +-
 source/references/modules/webview.md            |    2 +-
 source/references/weex-variable.md              |  151 +-
 source/resources.md                             |   49 +
 source/tools/index.md                           |    2 +-
 source/tools/toolkit.md                         |  218 +-
 source/wiki/common-styles.md                    |    2 +-
 source/wiki/faq.md                              |    1 -
 source/wiki/gestures.md                         |    1 +
 source/wiki/images/css-boxmodel.png             |  Bin 0 -> 12581 bytes
 source/wiki/images/css-flexbox-align.jpg        |  Bin 0 -> 35005 bytes
 source/wiki/images/css-flexbox-justify.svg      |   59 +
 source/wiki/images/css-flexbox-sample.png       |  Bin 0 -> 3210 bytes
 source/wiki/images/nav.png                      |  Bin 0 -> 83497 bytes
 themes/weex/languages/cn.yml                    |    1 +
 themes/weex/languages/en.yml                    |    1 +
 themes/weex/layout/_partial/article.ejs         |    4 +-
 themes/weex/layout/_partial/header.ejs          |    7 +-
 themes/weex/layout/_partial/post/summary.ejs    |   21 +-
 themes/weex/layout/index.ejs                    |  149 +-
 themes/weex/scripts/helper.js                   |    6 +-
 themes/weex/source/css/common.scss              |    2 +-
 themes/weex/source/css/media-queries.scss       |   21 +
 themes/weex/source/css/partial/article.scss     |   45 +-
 themes/weex/source/css/partial/highlight.scss   |    4 +-
 themes/weex/source/css/partial/summary.scss     |    3 +
 themes/weex/source/css/post.scss                |   11 +-
 themes/weex/source/css/variable.scss            |    2 +-
 themes/weex/source/js/common.js                 |   73 +-
 137 files changed, 5460 insertions(+), 3909 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/aaf57d5e/source/references/components/refresh.md
----------------------------------------------------------------------

Reply via email to