Skip to content

Commit ac26edb

Browse files
uxsiuxsi
committed
weui-wxss-beta2.0
1 parent 164eb12 commit ac26edb

File tree

188 files changed

+1340
-346
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+1340
-346
lines changed

Diff for: ‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
*~
33
.idea
44
node_modules
5-
npm-debug.log
5+
npm-debug.log
6+
.DS_Store

Diff for: ‎dist/app.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
"example/actionsheet/actionsheet",
2424
"example/dialog/dialog",
2525
"example/msg/msg",
26+
"example/msg/msg_text",
27+
"example/msg/msg_text_primary",
2628
"example/msg/msg_success",
2729
"example/msg/msg_fail",
2830
"example/picker/picker",
@@ -46,4 +48,4 @@
4648
"downloadFile": 10000
4749
},
4850
"debug": true
49-
}
51+
}

Diff for: ‎dist/app.wxss

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import 'style/weui.wxss';
22

33
page{
4-
background-color: #F8F8F8;
4+
background-color: #EDEDED;
55
font-size: 16px;
66
font-family: -apple-system-font,Helvetica Neue,Helvetica,sans-serif;
77
}
@@ -32,4 +32,7 @@ page{
3232
color: #888888;
3333
text-align: left;
3434
font-size: 14px;
35-
}
35+
}
36+
.weui-cell_example:before{
37+
left:52px;
38+
}

Diff for: ‎dist/example/actionsheet/actionsheet.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"usingComponents": {}
3+
}

Diff for: ‎dist/example/actionsheet/actionsheet.wxml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</view>
66
<view class="page__bd">
77
<view class="weui-btn-area">
8-
<button type="default" bindtap="open">ActionSheet</button>
8+
<button class="weui-btn" type="default" bindtap="open">ActionSheet</button>
99
</view>
1010
</view>
11-
</view>
11+
</view>

Diff for: ‎dist/example/article/article.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"usingComponents": {}
3+
}

Diff for: ‎dist/example/article/article.wxml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<view class="weui-article">
88
<view class="weui-article__h1">大标题</view>
99
<view class="weui-article__section">
10-
<view class="weui-article__title">章标题</view>
10+
<view class="weui-article__h2">章标题</view>
1111
<view class="weui-article__section">
1212
<view class="weui-article__h3">1.1 节标题</view>
1313
<view class="weui-article__p">
@@ -33,4 +33,4 @@
3333
</view>
3434
</view>
3535
</view>
36-
</view>
36+
</view>

Diff for: ‎dist/example/badge/badge.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"usingComponents": {}
3+
}

Diff for: ‎dist/example/badge/badge.wxss

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/* example/badge/badge.wxss */

Diff for: ‎dist/example/button/button.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"usingComponents": {}
3+
}

Diff for: ‎dist/example/button/button.wxml

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
<view class="page__desc">按钮，WeUI采用小程序原生的按钮为主体，加入一些间距的样式。</view>
55
</view>
66
<view class="page__bd page__bd_spacing">
7-
<button class="weui-btn" type="primary">页面主操作 Normal</button>
8-
<button class="weui-btn" type="primary" disabled="true">页面主操作 Disabled</button>
7+
<button class="weui-btn" type="primary">页面主操作</button>
8+
<button class="weui-btn" type="primary" disabled="true">页面主操作</button>
99

10-
<button class="weui-btn" type="default">页面次要操作 Normal</button>
11-
<button class="weui-btn" type="default" disabled="true">页面次要操作 Disabled</button>
10+
<button class="weui-btn" type="default">页面次要操作</button>
11+
<button class="weui-btn" type="default" disabled="true">页面次要操作</button>
1212

13-
<button class="weui-btn" type="warn">警告类操作 Normal</button>
14-
<button class="weui-btn" type="warn" disabled="true">警告类操作 Disabled</button>
13+
<button class="weui-btn" type="warn">警告类操作</button>
14+
<button class="weui-btn" type="warn" disabled="true">警告类操作</button>
1515

1616
<view class="button-sp-area">
1717
<button class="weui-btn" type="primary" plain="true">按钮</button>
@@ -25,4 +25,4 @@
2525
<button class="weui-btn mini-btn" type="warn" size="mini">按钮</button>
2626
</view>
2727
</view>
28-
</view>
28+
</view>

Diff for: ‎dist/example/button/button.wxss

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
page{background-color:#EDEDED;}
12
.button-sp-area{
23
margin: 0 auto;
34
padding-top: 15px;
4-
width: 60%;
5+
text-align:center;
56
}
67
.mini-btn{
7-
margin-right: 5px;
8-
}
8+
margin: 0 4px;
9+
}

Diff for: ‎dist/example/dialog/dialog.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"usingComponents": {}
3+
}

Diff for: ‎dist/example/flex/flex.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"usingComponents": {}
3+
}

Diff for: ‎dist/example/flex/flex.wxss

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
margin: 5px;
33
padding: 0 10px;
44
text-align: center;
5-
background-color: #EBEBEB;
5+
background-color: #F7F7F7;
66
height: 2.3em;
77
line-height: 2.3em;
8-
color: #cfcfcf;
9-
}
8+
color: rgba(0,0,0,.3);
9+
}

Diff for: ‎dist/example/footer/footer.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"usingComponents": {}
3+
}

Diff for: ‎dist/example/gallery/gallery.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"usingComponents": {}
3+
}

Diff for: ‎dist/example/gallery/gallery.wxss

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/* example/gallery/gallery.wxss */

Diff for: ‎dist/example/grid/grid.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"usingComponents": {}
3+
}

Diff for: ‎dist/example/grid/grid.wxss

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/* example/grid/grid.wxss */

Diff for: ‎dist/example/icons/icons.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"usingComponents": {}
3+
}

Diff for: ‎dist/example/icons/icons.wxml

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,35 @@
55
</view>
66
<view class="page__bd">
77
<view class="icon-box">
8-
<icon type="success" size="93"></icon>
8+
<icon type="success" size="64"></icon>
99
<view class="icon-box__ctn">
1010
<view class="icon-box__title">成功</view>
1111
<view class="icon-box__desc">用于表示操作顺利达成</view>
1212
</view>
1313
</view>
1414
<view class="icon-box">
15-
<icon type="info" size="93"></icon>
15+
<icon type="info" size="64"></icon>
1616
<view class="icon-box__ctn">
1717
<view class="icon-box__title">提示</view>
1818
<view class="icon-box__desc">用于表示信息提示；也常用于缺乏条件的操作拦截，提示用户所需信息</view>
1919
</view>
2020
</view>
2121
<view class="icon-box">
22-
<icon type="warn" size="93" color="#FFBE00"></icon>
22+
<icon type="warn" size="64" color="#FFBE00"></icon>
2323
<view class="icon-box__ctn">
2424
<view class="icon-box__title">普通警告</view>
2525
<view class="icon-box__desc">用于表示操作后将引起一定后果的情况</view>
2626
</view>
2727
</view>
2828
<view class="icon-box">
29-
<icon type="warn" size="93"></icon>
29+
<icon type="warn" size="64"></icon>
3030
<view class="icon-box__ctn">
3131
<view class="icon-box__title">强烈警告</view>
3232
<view class="icon-box__desc">用于表示操作后将引起严重的不可挽回的后果的情况</view>
3333
</view>
3434
</view>
3535
<view class="icon-box">
36-
<icon type="waiting" size="93"></icon>
36+
<icon type="waiting" size="64"></icon>
3737
<view class="icon-box__ctn">
3838
<view class="icon-box__title">等待</view>
3939
<view class="icon-box__desc">用于表示等待</view>
@@ -50,4 +50,4 @@
5050
<icon type="search" size="20"></icon>
5151
</view>
5252
</view>
53-
</view>
53+
</view>

Diff for: ‎dist/example/index.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"usingComponents": {}
3+
}

Diff for: ‎dist/example/index.wxss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* WeUI v1.1.1 (https://github.com/weui/weui-wxss)
3-
* Copyright 2017 Tencent, Inc.
3+
* Copyright 2019 Tencent, Inc.
44
* Licensed under the MIT license
55
*/
66
.weui-flex{-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-cells{margin-top:0;opacity:0;-webkit-transform:translateY(-50%);transform:translateY(-50%);-webkit-transition:.3s;transition:.3s}.weui-cells:after,.weui-cells:before{display:none}.weui-cells_show{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}.weui-cell:before{right:15px}.kind-list__item{margin:10px 0;background-color:#fff;border-radius:2px;overflow:hidden}.kind-list__item:first-child{margin-top:0}.kind-list__img{width:30px;height:30px}.kind-list__item-hd{padding:20px;-webkit-transition:opacity .3s;transition:opacity .3s}.kind-list__item-hd_show{opacity:.4}.kind-list__item-bd{height:0;overflow:hidden}.kind-list__item-bd_show{height:auto}

Diff for: ‎dist/example/input/input.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"usingComponents": {}
3+
}

Diff for: ‎dist/example/input/input.wxss

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/* example/input/input.wxss */

Diff for: ‎dist/example/list/list.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"usingComponents": {}
3+
}

Diff for: ‎dist/example/list/list.wxml

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414

1515
<view class="weui-cells__title">带图标、说明的列表项</view>
1616
<view class="weui-cells weui-cells_after-title">
17-
<view class="weui-cell">
17+
<view class="weui-cell weui-cell_example ">
1818
<view class="weui-cell__hd">
19-
<image src="{{icon}}" style="margin-right: 5px;vertical-align: middle;width:20px; height: 20px;"></image>
19+
<image src="{{icon}}" style="margin-right: 16px;vertical-align: middle;width:20px; height: 20px;"></image>
2020
</view>
2121
<view class="weui-cell__bd">标题文字</view>
2222
<view class="weui-cell__ft">说明文字</view>
2323
</view>
24-
<view class="weui-cell">
24+
<view class="weui-cell weui-cell_example ">
2525
<view class="weui-cell__hd">
26-
<image src="{{icon}}" style="margin-right: 5px;vertical-align: middle;width:20px; height: 20px;"></image>
26+
<image src="{{icon}}" style="margin-right: 16px;vertical-align: middle;width:20px; height: 20px;"></image>
2727
</view>
2828
<view class="weui-cell__bd">标题文字</view>
2929
<view class="weui-cell__ft">说明文字</view>
@@ -58,18 +58,18 @@
5858
<view class="weui-cells weui-cells_after-title">
5959
<navigator url="" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
6060
<view class="weui-cell__hd">
61-
<image src="{{icon}}" style="margin-right: 5px;vertical-align: middle;width:20px; height: 20px;"></image>
61+
<image src="{{icon}}" style="margin-right: 16px;vertical-align: middle;width:20px; height: 20px;"></image>
6262
</view>
6363
<view class="weui-cell__bd">cell standard</view>
6464
<view class="weui-cell__ft weui-cell__ft_in-access">说明文字</view>
6565
</navigator>
66-
<navigator url="" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
66+
<navigator url="" class="weui-cell weui-cell_example weui-cell_access" hover-class="weui-cell_active">
6767
<view class="weui-cell__hd">
68-
<image src="{{icon}}" style="margin-right: 5px;vertical-align: middle;width:20px; height: 20px;"></image>
68+
<image src="{{icon}}" style="margin-right: 16px;vertical-align: middle;width:20px; height: 20px;"></image>
6969
</view>
7070
<view class="weui-cell__bd">cell standard</view>
7171
<view class="weui-cell__ft weui-cell__ft_in-access">说明文字</view>
7272
</navigator>
7373
</view>
7474
</view>
75-
</view>
75+
</view>

Diff for: ‎dist/example/list/list.wxss

Whitespace-only changes.

Diff for: ‎dist/example/loadmore/loadmore.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"usingComponents": {}
3+
}

Diff for: ‎dist/example/msg/msg.js

+11-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,19 @@ Page({
44
url: 'msg_success'
55
})
66
},
7+
openText: function () {
8+
wx.navigateTo({
9+
url: 'msg_text'
10+
})
11+
},
12+
openTextPrimary: function () {
13+
wx.navigateTo({
14+
url: 'msg_text_primary'
15+
})
16+
},
717
openFail: function () {
818
wx.navigateTo({
919
url: 'msg_fail'
1020
})
1121
}
12-
});
22+
});

Diff for: ‎dist/example/msg/msg.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"usingComponents": {}
3+
}

Diff for: ‎dist/example/msg/msg.wxml

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
<view class="weui-btn-area">
88
<button class="weui-btn" type="default" bindtap="openSuccess">成功提示页</button>
99
<button class="weui-btn" type="default" bindtap="openFail">失败提示页</button>
10+
<button class="weui-btn" type="default" bindtap="openText">无图标提示页</button>
11+
<button class="weui-btn" type="default" bindtap="openTextPrimary">无图标提示页</button>
1012
</view>
1113
</view>
12-
</view>
14+
</view>

Diff for: ‎dist/example/msg/msg.wxss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
page{
22
background-color: #FFFFFF;
3-
}
3+
}

Diff for: ‎dist/example/msg/msg_fail.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"usingComponents": {}
3+
}

Diff for: ‎dist/example/msg/msg_fail.wxml

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<view class="page">
22
<view class="weui-msg">
33
<view class="weui-msg__icon-area">
4-
<icon type="warn" size="93"></icon>
4+
<icon type="warn" size="64"></icon>
55
</view>
66
<view class="weui-msg__text-area">
77
<view class="weui-msg__title">操作失败</view>
88
<view class="weui-msg__desc">内容详情，可根据实际需要安排，如果换行则不超过规定长度，居中展现<navigator url="" class="weui-msg__link">文字链接</navigator></view>
99
</view>
10+
<view class="weui-msg__tips-area">
11+
<view class="weui-msg__tips">内容详情，可根据实际需要安排，如果换行则不超过规定长度，居中展现<navigator url="" class="weui-msg__link">文字链接</navigator></view>
12+
</view>
1013
<view class="weui-msg__opr-area">
1114
<view class="weui-btn-area">
12-
<button class="weui-btn" type="primary">推荐操作</button>
1315
<button class="weui-btn" type="default">辅助操作</button>
1416
</view>
1517
</view>
@@ -22,4 +24,4 @@
2224
</view>
2325
</view>
2426
</view>
25-
</view>
27+
</view>

Diff for: ‎dist/example/msg/msg_fail.wxss

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
page{
22
background-color: #FFFFFF;
3-
}
3+
}
4+
page,.page{height:100%;}

Diff for: ‎dist/example/msg/msg_success copy.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Page({});

Diff for: ‎dist/example/msg/msg_success.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"usingComponents": {}
3+
}

0 commit comments

Comments
 (0)