From 0ef8cd410f719cef892ea4f76b1a27790b32de44 Mon Sep 17 00:00:00 2001 From: yiminghe Date: Wed, 15 Jul 2015 11:22:23 +0800 Subject: [PATCH 1/2] optimize deploy --- package.json | 2 +- scripts/install.js | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 scripts/install.js diff --git a/package.json b/package.json index 3515e9be9..56d14f872 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,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" diff --git a/scripts/install.js b/scripts/install.js new file mode 100644 index 000000000..847ed51d3 --- /dev/null +++ b/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'); + }); +}); \ No newline at end of file From c39a1e3d025a3b81f5526f4fc3ad416b82ef6ac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=B0=E6=96=87?= Date: Wed, 15 Jul 2015 11:34:18 +0800 Subject: [PATCH 2/2] chore: change collapse color --- style/components/collapse.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/style/components/collapse.less b/style/components/collapse.less index 035458348..040fe29d0 100644 --- a/style/components/collapse.less +++ b/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;