编译为mui v3.4.0

dcloudio · Nov 4, 2016 · 9161688 · 9161688
1 parent a47b2cb
commit 9161688
Show file tree

Hide file tree

Showing 18 changed files with 2,321 additions and 1,848 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -94,8 +94,8 @@ module.exports = function(grunt) {
 					'js/mui.progressbar.js',
 					'js/input.plugin.js',
 					'js/mui.transparent.js',
-					'js/mui.number.js'
-
+					'js/mui.number.js',
+					'js/mui.button.js'
 				],
 				dest: '<%= meta.distPath %>js/<%= pkg.name %>.js',
 			}

diff --git a/dist/css/mui.css b/dist/css/mui.css
@@ -1,6 +1,6 @@
 /*!
  * =====================================================
- * Mui v3.3.0 (http://dev.dcloud.net.cn/mui)
+ * Mui v3.4.0 (http://dev.dcloud.net.cn/mui)
  * =====================================================
  */
 
@@ -1234,67 +1234,88 @@ button.mui-disabled,
 }
 
 input[type='submit'],
-.mui-btn-primary, .mui-btn-blue
+.mui-btn-primary,
+.mui-btn-blue
 {
     color: #fff;
     border: 1px solid #007aff;
     background-color: #007aff;
 }
 input[type='submit']:enabled:active, input[type='submit'].mui-active:enabled,
 .mui-btn-primary:enabled:active,
-.mui-btn-primary.mui-active:enabled, .mui-btn-blue:enabled:active, .mui-btn-blue.mui-active:enabled
+.mui-btn-primary.mui-active:enabled,
+.mui-btn-blue:enabled:active,
+.mui-btn-blue.mui-active:enabled
 {
     color: #fff;
     border: 1px solid #0062cc;
     background-color: #0062cc;
 }
 
-.mui-btn-positive, .mui-btn-success, .mui-btn-green
+.mui-btn-positive,
+.mui-btn-success,
+.mui-btn-green
 {
     color: #fff;
     border: 1px solid #4cd964;
     background-color: #4cd964;
 }
-.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
+.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
 {
     color: #fff;
     border: 1px solid #2ac845;
     background-color: #2ac845;
 }
 
-.mui-btn-warning, .mui-btn-yellow
+.mui-btn-warning,
+.mui-btn-yellow
 {
     color: #fff;
     border: 1px solid #f0ad4e;
     background-color: #f0ad4e;
 }
-.mui-btn-warning:enabled:active, .mui-btn-warning.mui-active:enabled, .mui-btn-yellow:enabled:active, .mui-btn-yellow.mui-active:enabled
+.mui-btn-warning:enabled:active, .mui-btn-warning.mui-active:enabled,
+.mui-btn-yellow:enabled:active,
+.mui-btn-yellow.mui-active:enabled
 {
     color: #fff;
     border: 1px solid #ec971f;
     background-color: #ec971f;
 }
 
-.mui-btn-negative, .mui-btn-danger, .mui-btn-red
+.mui-btn-negative,
+.mui-btn-danger,
+.mui-btn-red
 {
     color: #fff;
     border: 1px solid #dd524d;
     background-color: #dd524d;
 }
-.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
+.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
 {
     color: #fff;
     border: 1px solid #cf2d28;
     background-color: #cf2d28;
 }
 
-.mui-btn-royal, .mui-btn-purple
+.mui-btn-royal,
+.mui-btn-purple
 {
     color: #fff;
     border: 1px solid #8a6de9;
     background-color: #8a6de9;
 }
-.mui-btn-royal:enabled:active, .mui-btn-royal.mui-active:enabled, .mui-btn-purple:enabled:active, .mui-btn-purple.mui-active:enabled
+.mui-btn-royal:enabled:active, .mui-btn-royal.mui-active:enabled,
+.mui-btn-purple:enabled:active,
+.mui-btn-purple.mui-active:enabled
 {
     color: #fff;
     border: 1px solid #6641e2;
@@ -1434,6 +1455,20 @@ input[type='submit']:enabled:active, input[type='submit'].mui-active:enabled,
     height: 24px;
 }
 
+.mui-btn .mui-spinner
+{
+    width: 14px;
+    height: 14px;
+
+    vertical-align: text-bottom;
+}
+
+.mui-btn-block .mui-spinner
+{
+    width: 22px;
+    height: 22px;
+}
+
 .mui-bar
 {
     position: fixed;

diff --git a/dist/css/mui.min.css b/dist/css/mui.min.css