Skip to content

Commit 9161688

Browse files
committed
编译为mui v3.4.0
1 parent a47b2cb commit 9161688

File tree

18 files changed

+2321
-1848
lines changed

18 files changed

+2321
-1848
lines changed

Gruntfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ module.exports = function(grunt) {
9494
'js/mui.progressbar.js',
9595
'js/input.plugin.js',
9696
'js/mui.transparent.js',
97-
'js/mui.number.js'
98-
97+
'js/mui.number.js',
98+
'js/mui.button.js'
9999
],
100100
dest: '<%= meta.distPath %>js/<%= pkg.name %>.js',
101101
}

dist/css/mui.css

Lines changed: 46 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* =====================================================
3-
* Mui v3.3.0 (http://dev.dcloud.net.cn/mui)
3+
* Mui v3.4.0 (http://dev.dcloud.net.cn/mui)
44
* =====================================================
55
*/
66

@@ -1234,67 +1234,88 @@ button.mui-disabled,
12341234
}
12351235

12361236
input[type='submit'],
1237-
.mui-btn-primary, .mui-btn-blue
1237+
.mui-btn-primary,
1238+
.mui-btn-blue
12381239
{
12391240
color: #fff;
12401241
border: 1px solid #007aff;
12411242
background-color: #007aff;
12421243
}
12431244
input[type='submit']:enabled:active, input[type='submit'].mui-active:enabled,
12441245
.mui-btn-primary:enabled:active,
1245-
.mui-btn-primary.mui-active:enabled, .mui-btn-blue:enabled:active, .mui-btn-blue.mui-active:enabled
1246+
.mui-btn-primary.mui-active:enabled,
1247+
.mui-btn-blue:enabled:active,
1248+
.mui-btn-blue.mui-active:enabled
12461249
{
12471250
color: #fff;
12481251
border: 1px solid #0062cc;
12491252
background-color: #0062cc;
12501253
}
12511254

1252-
.mui-btn-positive, .mui-btn-success, .mui-btn-green
1255+
.mui-btn-positive,
1256+
.mui-btn-success,
1257+
.mui-btn-green
12531258
{
12541259
color: #fff;
12551260
border: 1px solid #4cd964;
12561261
background-color: #4cd964;
12571262
}
1258-
.mui-btn-positive:enabled:active, .mui-btn-positive.mui-active:enabled, .mui-btn-success:enabled:active, .mui-btn-success.mui-active:enabled, .mui-btn-green:enabled:active, .mui-btn-green.mui-active:enabled
1263+
.mui-btn-positive:enabled:active, .mui-btn-positive.mui-active:enabled,
1264+
.mui-btn-success:enabled:active,
1265+
.mui-btn-success.mui-active:enabled,
1266+
.mui-btn-green:enabled:active,
1267+
.mui-btn-green.mui-active:enabled
12591268
{
12601269
color: #fff;
12611270
border: 1px solid #2ac845;
12621271
background-color: #2ac845;
12631272
}
12641273

1265-
.mui-btn-warning, .mui-btn-yellow
1274+
.mui-btn-warning,
1275+
.mui-btn-yellow
12661276
{
12671277
color: #fff;
12681278
border: 1px solid #f0ad4e;
12691279
background-color: #f0ad4e;
12701280
}
1271-
.mui-btn-warning:enabled:active, .mui-btn-warning.mui-active:enabled, .mui-btn-yellow:enabled:active, .mui-btn-yellow.mui-active:enabled
1281+
.mui-btn-warning:enabled:active, .mui-btn-warning.mui-active:enabled,
1282+
.mui-btn-yellow:enabled:active,
1283+
.mui-btn-yellow.mui-active:enabled
12721284
{
12731285
color: #fff;
12741286
border: 1px solid #ec971f;
12751287
background-color: #ec971f;
12761288
}
12771289

1278-
.mui-btn-negative, .mui-btn-danger, .mui-btn-red
1290+
.mui-btn-negative,
1291+
.mui-btn-danger,
1292+
.mui-btn-red
12791293
{
12801294
color: #fff;
12811295
border: 1px solid #dd524d;
12821296
background-color: #dd524d;
12831297
}
1284-
.mui-btn-negative:enabled:active, .mui-btn-negative.mui-active:enabled, .mui-btn-danger:enabled:active, .mui-btn-danger.mui-active:enabled, .mui-btn-red:enabled:active, .mui-btn-red.mui-active:enabled
1298+
.mui-btn-negative:enabled:active, .mui-btn-negative.mui-active:enabled,
1299+
.mui-btn-danger:enabled:active,
1300+
.mui-btn-danger.mui-active:enabled,
1301+
.mui-btn-red:enabled:active,
1302+
.mui-btn-red.mui-active:enabled
12851303
{
12861304
color: #fff;
12871305
border: 1px solid #cf2d28;
12881306
background-color: #cf2d28;
12891307
}
12901308

1291-
.mui-btn-royal, .mui-btn-purple
1309+
.mui-btn-royal,
1310+
.mui-btn-purple
12921311
{
12931312
color: #fff;
12941313
border: 1px solid #8a6de9;
12951314
background-color: #8a6de9;
12961315
}
1297-
.mui-btn-royal:enabled:active, .mui-btn-royal.mui-active:enabled, .mui-btn-purple:enabled:active, .mui-btn-purple.mui-active:enabled
1316+
.mui-btn-royal:enabled:active, .mui-btn-royal.mui-active:enabled,
1317+
.mui-btn-purple:enabled:active,
1318+
.mui-btn-purple.mui-active:enabled
12981319
{
12991320
color: #fff;
13001321
border: 1px solid #6641e2;
@@ -1434,6 +1455,20 @@ input[type='submit']:enabled:active, input[type='submit'].mui-active:enabled,
14341455
height: 24px;
14351456
}
14361457

1458+
.mui-btn .mui-spinner
1459+
{
1460+
width: 14px;
1461+
height: 14px;
1462+
1463+
vertical-align: text-bottom;
1464+
}
1465+
1466+
.mui-btn-block .mui-spinner
1467+
{
1468+
width: 22px;
1469+
height: 22px;
1470+
}
1471+
14371472
.mui-bar
14381473
{
14391474
position: fixed;

dist/css/mui.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)