Skip to content

Commit 66510ff

Browse files
uxsiuxsi
committed
v1.1.1
2 parents 0064a17 + e62b6ec commit 66510ff

20 files changed

Lines changed: 86 additions & 39 deletions

‎CHANGELOG.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
#### v1.1.1 (2017-01-17)
2+
3+
- 【修复】 fix icon-safe的错乱问题
4+
- 【增强】 增加按钮loading状态
5+
- 【增强】 更新普通警告图标颜色
6+
7+
8+
19
#### v1.1.0 (2016-11-21)
210

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

233241
初始发布
234242

235-
- Initial release
243+
- Initial release

‎bower.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"description": "wechat mobile ui",
88
"main": "dist/style/weui.css",
9-
"version": "1.1.0",
9+
"version": "1.1.1",
1010
"authors": [
1111
"wechat ui team"
1212
],
@@ -19,4 +19,4 @@
1919
],
2020
"homepage": "https://github.com/weui/weui",
2121
"ignore": []
22-
}
22+
}

‎dist/example/example.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/example/index.html‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,13 @@ <h1 class="page__title">Button</h1>
280280
</div>
281281
<div class="page__bd page__bd_spacing">
282282
<a href="javascript:;" class="weui-btn weui-btn_primary">页面主操作 Normal</a>
283+
<a href="javascript:;" class="weui-btn weui-btn_primary weui-btn_loading"><i class="weui-loading"></i>页面主操作 Loading</a>
283284
<a href="javascript:;" class="weui-btn weui-btn_disabled weui-btn_primary">页面主操作 Disabled</a>
284285
<a href="javascript:;" class="weui-btn weui-btn_default">页面次要操作 Normal</a>
286+
<a href="javascript:;" class="weui-btn weui-btn_default weui-btn_loading"><i class="weui-loading"></i>页面次操作 Loading</a>
285287
<a href="javascript:;" class="weui-btn weui-btn_disabled weui-btn_default">页面次要操作 Disabled</a>
286288
<a href="javascript:;" class="weui-btn weui-btn_warn">警告类操作 Normal</a>
289+
<a href="javascript:;" class="weui-btn weui-btn_warn weui-btn_loading"><i class="weui-loading"></i>警告类操作 Loading</a>
287290
<a href="javascript:;" class="weui-btn weui-btn_disabled weui-btn_warn">警告类操作 Disabled</a>
288291

289292
<div class="button-sp-area">
@@ -300,6 +303,7 @@ <h1 class="page__title">Button</h1>
300303
<a href="javascript:home()"><img src="./images/icon_footer_link.png" /></a>
301304
</div>
302305
</div>
306+
303307
</script>
304308
<script type="text/html" id="tpl_list">
305309
<div class="page">
@@ -681,6 +685,7 @@ <h1 class="page__title">Toast</h1>
681685
});
682686
});
683687
</script>
688+
684689
</script>
685690
<script type="text/html" id="tpl_dialog">
686691
<div class="page">
@@ -1929,7 +1934,7 @@ <h1 class="page__title">Slider</h1>
19291934
</script>
19301935
<script src="./zepto.min.js"></script>
19311936
<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
1932-
<script src="./weui.min.js"></script>
1937+
<script src="https://res.wx.qq.com/open/libs/weuijs/1.0.0/weui.min.js"></script>
19331938
<script src="./example.js"></script>
19341939
</body>
19351940
</html>

‎dist/example/weui.min.js‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)