Merge branch 'master' of github.com:ant-design/ant-design

package.json

@@ -59,7 +59,7 @@
     "pack": "npm run clean && webpack --optimize-minimize && nico build",
     "start": "npm run clean && nico server --watch",
     "clean": "rm -rf _site",
-    "deploy": "npm run pack && node scripts/deploy.js",
+    "deploy": "rm -rf node_modules && node scripts/install.js && npm run pack && node scripts/deploy.js",
     "lint": "eslint components index.js --ext '.js,.jsx'",
     "test": "webpack && npm run lint",
     "prepublish": "npm run babel"

scripts/install.js

@@ -0,0 +1,23 @@
+function runCmd(cmd, args, fn) {
+  args = args || [];
+  var runner = require('child_process').spawn(cmd, args, {
+    // keep color
+    stdio: "inherit"
+  });
+  runner.on('close', function (code) {
+    if (fn) {
+      fn(code);
+    }
+  });
+}
+
+runCmd('which', ['tnpm'], function (code) {
+  var npm = 'npm';
+  if (!code) {
+    npm = 'tnpm';
+  }
+  console.log(npm + ' installing');
+  runCmd(npm, ['install'], function () {
+    console.log(npm + ' install end');
+  });
+});

style/components/collapse.less

@@ -22,7 +22,7 @@
 }
 
 .@{prefixCls} {
-  background-color: #fbfbfb;
+  background-color: #f4f4f4;
   border-radius: 3px;
   border-top: @borderStyle;
   border-left: @borderStyle;
@@ -53,7 +53,7 @@
     overflow: hidden;
     color: #999;
     padding: 0 16px;
-    background-color: #f4f4f4;
+    background-color: #fff;
 
     & > &-box {
       margin-top: 16px;