You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/03/31 07:28:51 UTC
[16/50] [abbrv] incubator-weex git commit: Merge branch
'html5-feature-vue-render-process-style' into html5-feature-vue-render
Merge branch 'html5-feature-vue-render-process-style' into html5-feature-vue-render
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/cd390b19
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cd390b19
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cd390b19
Branch: refs/heads/0.12-dev
Commit: cd390b1930384173681432f5239cfae9b87f9140
Parents: 30dda1a 9c305ec
Author: MrRaindrop <te...@gmail.com>
Authored: Thu Mar 23 18:44:42 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Thu Mar 23 18:44:42 2017 +0800
----------------------------------------------------------------------
build/webpack.examples.web.config.js | 18 +++++
examples/vue/include/panel.vue | 8 +-
html5/render/vue/README.md | 28 ++++++-
html5/render/vue/components/a.js | 3 +-
html5/render/vue/components/div.js | 5 +-
html5/render/vue/components/image.js | 16 +---
.../render/vue/components/scrollable/header.js | 3 +-
.../vue/components/scrollable/list/cell.js | 5 +-
.../vue/components/scrollable/list/index.js | 3 -
.../components/scrollable/loading-indicator.js | 3 +-
.../render/vue/components/scrollable/loading.js | 3 +-
.../render/vue/components/scrollable/refresh.js | 3 +-
.../vue/components/scrollable/scroller.js | 1 -
html5/render/vue/components/textarea.js | 3 +-
html5/render/vue/components/web.js | 3 +-
html5/render/vue/mixins/base.js | 13 ++++
html5/render/vue/mixins/style.js | 70 ++++++++----------
html5/render/vue/styles/components.css | 6 ++
html5/render/vue/utils/flex.js | 77 --------------------
html5/render/vue/utils/index.js | 28 +++++++
html5/render/vue/utils/style.js | 9 ---
package.json | 3 +-
packages/weex-vue-render/README.md | 28 ++++++-
23 files changed, 166 insertions(+), 173 deletions(-)
----------------------------------------------------------------------