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

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.7.1 (2015-07-22)
+
+* 修复了 Table 组件的 pagination 为 false 时分页未消失的 [问题](https://github.com/ant-design/ant-design/commit/01a6c0f1e6707b72a54ef30d073d148a87b391a8)。
+* select 组件[选中后默认显示标签内容](https://github.com/ant-design/ant-design/issues/50)（原来是显示 value）。
+* 修正了部分组件的样式和演示。
+* 打包文件为 [umd 模式](https://github.com/ant-design/ant-design/commit/9b7b940cb417429d8fc57d83e252991b043d0f2f)。
+
 ## 0.7.0 (2015-07-21)
 
 * 第一个公开版本，发布 `layout`、`iconfont`、`button`、`form`、`checkbox`、`radio`、`switch`、`slider`、`input-number`、`datepicker`、`select`、`tabs`、`steps`、`breadcrumb`、`collapse`、`pagination`、`modal`、`message`、`dropdown`、`popover`、`popconfirm`、`tooltip`、`progress`、`table` 等组件。

components/modal/index.jsx

@@ -44,8 +44,8 @@ var Modal = React.createClass({
   render() {
     var props = this.props;
     var footer = props.footer || [
-        <button key="cancel" type="button" className="ant-btn-default ant-btn" onClick={this.handleCancel}>取 消</button>,
-        <button key="confirm" type="button" className="ant-btn-primary ant-btn" onClick={this.handleOk}>确 定</button>
+        <button key="cancel" type="button" className="ant-btn ant-btn-lg" onClick={this.handleCancel}>取 消</button>,
+        <button key="confirm" type="button" className="ant-btn ant-btn-primary ant-btn-lg" onClick={this.handleOk}>确 定</button>
       ];
     return <Dialog transitionName="zoom" onBeforeClose={props.onCancel} visible={this.state.visible} maskAnimation="fade" width="500" footer={footer} {...props} ref="d"/>;
   }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "antd",
-  "version": "0.7.1",
-  "stableVersion": "0.7.0",
+  "version": "0.8.0-beta",
+  "stableVersion": "0.7.1",
   "title": "Ant Design",
   "description": "一个设计&前端框架",
   "homepage": "http://ant.design/",

style/components/table.less

@@ -8,7 +8,6 @@
   color: @text-color;
   border-radius: 6px;
   transition: opacity 0.3s ease;
-  min-height: 200px;
 
   table {
     width: 100%;

webpack.config.min.js

@@ -7,7 +7,11 @@ var config = require("./webpack.config.js");
 
 config.plugins = [
   new ExtractTextPlugin('[name].min.css'),
-  new webpack.optimize.UglifyJsPlugin()
+  new webpack.optimize.UglifyJsPlugin({
+    output: {
+      ascii_only: true
+    }
+  })
 ];
 config.output.filename = config.output.filename.replace(/\.js$/, ".min.js");
 delete config.entry.demo;