Skip to content

Commit

Permalink
v1.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
uxsi committed Jan 17, 2017
2 parents 0064a17 + e62b6ec commit 66510ff
Show file tree
Hide file tree
Showing 20 changed files with 86 additions and 39 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
#### v1.1.1 (2017-01-17)

- 【修复】 fix icon-safe的错乱问题
- 【增强】 增加按钮loading状态
- 【增强】 更新普通警告图标颜色



#### v1.1.0 (2016-11-21)

- 【增强】 新增兼容IE Edge版本的switch
Expand Down Expand Up @@ -232,4 +240,4 @@

初始发布

- Initial release
- Initial release
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"description": "wechat mobile ui",
"main": "dist/style/weui.css",
"version": "1.1.0",
"version": "1.1.1",
"authors": [
"wechat ui team"
],
Expand All @@ -19,4 +19,4 @@
],
"homepage": "https://github.com/weui/weui",
"ignore": []
}
}
2 changes: 1 addition & 1 deletion dist/example/example.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion dist/example/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -280,10 +280,13 @@ <h1 class="page__title">Button</h1>
</div>
<div class="page__bd page__bd_spacing">
<a href="javascript:;" class="weui-btn weui-btn_primary">页面主操作 Normal</a>
<a href="javascript:;" class="weui-btn weui-btn_primary weui-btn_loading"><i class="weui-loading"></i>页面主操作 Loading</a>
<a href="javascript:;" class="weui-btn weui-btn_disabled weui-btn_primary">页面主操作 Disabled</a>
<a href="javascript:;" class="weui-btn weui-btn_default">页面次要操作 Normal</a>
<a href="javascript:;" class="weui-btn weui-btn_default weui-btn_loading"><i class="weui-loading"></i>页面次操作 Loading</a>
<a href="javascript:;" class="weui-btn weui-btn_disabled weui-btn_default">页面次要操作 Disabled</a>
<a href="javascript:;" class="weui-btn weui-btn_warn">警告类操作 Normal</a>
<a href="javascript:;" class="weui-btn weui-btn_warn weui-btn_loading"><i class="weui-loading"></i>警告类操作 Loading</a>
<a href="javascript:;" class="weui-btn weui-btn_disabled weui-btn_warn">警告类操作 Disabled</a>

<div class="button-sp-area">
Expand All @@ -300,6 +303,7 @@ <h1 class="page__title">Button</h1>
<a href="javascript:home()"><img src="./images/icon_footer_link.png" /></a>
</div>
</div>

</script>
<script type="text/html" id="tpl_list">
<div class="page">
Expand Down Expand Up @@ -681,6 +685,7 @@ <h1 class="page__title">Toast</h1>
});
});
</script>

</script>
<script type="text/html" id="tpl_dialog">
<div class="page">
Expand Down Expand Up @@ -1929,7 +1934,7 @@ <h1 class="page__title">Slider</h1>
</script>
<script src="./zepto.min.js"></script>
<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
<script src="./weui.min.js"></script>
<script src="https://res.wx.qq.com/open/libs/weuijs/1.0.0/weui.min.js"></script>
<script src="./example.js"></script>
</body>
</html>
6 changes: 0 additions & 6 deletions dist/example/weui.min.js

This file was deleted.

Loading

0 comments on commit 66510ff

Please sign in to comment.