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/06/22 05:28:29 UTC
[38/40] incubator-weex git commit: Merge branch '0.14-dev' of
https://github.com/MrRaindrop/incubator-weex into 0.14-dev
Merge branch '0.14-dev' of https://github.com/MrRaindrop/incubator-weex into 0.14-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/15c7cd02
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/15c7cd02
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/15c7cd02
Branch: refs/heads/0.15-dev
Commit: 15c7cd02934e506af3d18d539827c19b6de4727e
Parents: 8983f24 76ab14b
Author: tancy <ro...@gmail.com>
Authored: Thu Jun 22 10:38:46 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Thu Jun 22 10:38:46 2017 +0800
----------------------------------------------------------------------
html5/render/vue/components/index.js | 4 +-
.../components/scrollable/loading-indicator.js | 138 ++++++++++++++++++-
html5/render/vue/mixins/style.js | 11 +-
html5/render/vue/styles/base.css | 56 --------
html5/render/vue/utils/func.js | 30 ++++
html5/render/vue/utils/style.js | 33 +++++
6 files changed, 210 insertions(+), 62 deletions(-)
----------------------------------------------------------------------