Merge branch 'dev' of https://github.com/ant-design/ant-design.github.io into dev
Conflicts: static/style.css
Showing
components/confirm/index.md
0 → 100644
components/iconfont/index.md
0 → 100644
components/layout/index.md
0 → 100644
components/modal/index.md
0 → 100644
components/progress/index.md
0 → 100644
components/select/index.md
0 → 100644
components/select/select.md
已删除
100644 → 0
components/tab/index.md
0 → 100644
components/tooltip/index.md
0 → 100644
... | ... | @@ -14,7 +14,7 @@ |
"gregorian-calendar": "~3.0.0", | ||
"gregorian-calendar-format": "~3.0.1", | ||
"rc-calendar": "~3.5.3", | ||
"rc-style": "https://github.com/react-component/style.git" | ||
"rc-style": "git://github.com/react-component/style.git" | ||
}, | ||
"devDependencies": { | ||
"concurrently": "~0.1.0", | ||
... | ... | @@ -29,7 +29,7 @@ |
}, | ||
"scripts": { | ||
"build": "npm run clean && webpack && nico build", | ||
"start": "npm run clean && concurrent --kill-others 'webpack -w' 'nico server --watch'", | ||
"start": "npm run clean && concurrent -r 'webpack -w --watch-aggregate-timeout 0' 'nico server --watch'", | ||
"clean": "rm -rf _site", | ||
"deploy": "npm run build && gh-pages -d _site -b master" | ||
} | ||
... | ... |
想要评论请 注册 或 登录