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

components/progress/demo/circle-mini.md

@@ -0,0 +1,27 @@
+# Circle 用法
+
+- order: 0
+
+Progress Circle用法
+
+---
+
+````jsx
+var Circle = antd.Progress.Circle;
+
+React.render(
+  <div>
+    <Circle percent="30" width="100" />
+    <Circle percent="70" width="100" status="exception" />
+    <Circle percent="100" width="100" />
+  </div>
+  , document.getElementById('components-progress-demo-circle-mini'));
+````
+
+<style>
+.ant-progress-circle-wrap,
+.ant-progress-line-wrap {
+  margin-right: 15px;
+  margin-bottom: 15px;
+}
+</style>

components/progress/demo/circle.md

@@ -11,9 +11,9 @@ var Circle = antd.Progress.Circle;
 
 React.render(
   <div>
-    <Circle percent="30" width="100" strokeWidth="4" />
+    <Circle percent="30" width="150" />
-    <Circle percent="70" width="100" strokeWidth="4" status="exception" />
+    <Circle percent="70" width="150" status="exception" />
-    <Circle percent="100" width="100" strokeWidth="4" />
+    <Circle percent="100" width="150" />
   </div>
   , document.getElementById('components-progress-demo-circle'));
 ````

components/progress/demo/line-mini.md

@@ -0,0 +1,19 @@
+# Line 用法
+
+- order: 0
+
+Progress Line用法
+
+---
+
+````jsx
+var Line = antd.Progress.Line;
+
+React.render(
+  <div>
+    <Line percent="30" width="170" strokeWidth="3" />
+    <Line percent="70" width="170" strokeWidth="3" status="exception" />
+    <Line percent="100" width="170" strokeWidth="3" />
+  </div>
+  , document.getElementById('components-progress-demo-line-mini'));
+````

components/progress/demo/line.md

@@ -11,9 +11,9 @@ var Line = antd.Progress.Line;
 
 React.render(
   <div>
-    <Line percent="30" width="300" strokeWidth="4" />
+    <Line percent="30" width="300" strokeWidth="3" />
-    <Line percent="70" width="300" strokeWidth="4" status="exception" />
+    <Line percent="70" width="300" strokeWidth="3" status="exception" />
-    <Line percent="100" width="300" strokeWidth="4" />
+    <Line percent="100" width="300" strokeWidth="3" />
   </div>
   , document.getElementById('components-progress-demo-line'));
 ````

components/progress/index.jsx

@@ -8,9 +8,9 @@ var Line = React.createClass({
   getDefaultProps: function () {
     return {
       percent: 0,
-      strokeWidth: 2,
+      strokeWidth: 4,
       status: 'normal' // exception
-    }
+    };
   },
   render() {
     var statusColorMap = {
@@ -20,42 +20,42 @@ var Line = React.createClass({
     };
 
     if (parseInt(this.props.percent) === 100) {
-      this.props.status = 'success'
+      this.props.status = 'success';
     }
 
     var style = {
       'width': this.props.width
-    }
+    };
     var wrapStyle = {
       'font-size': this.props.width / 100 * this.props.strokeWidth
-    }
+    };
     var textStyle = {
       'color': statusColorMap[this.props.status]
-    }
+    };
-    var progressInfo
+    var progressInfo;
     if (this.props.status === 'exception') {
       progressInfo = (
         <span style={textStyle} className='ant-progress-line-text'>
           <i className='anticon anticon-exclamation-round'></i>
         </span>
-      )
+      );
     } else if(this.props.status === 'success'){
       progressInfo = (
         <span style={textStyle} className='ant-progress-line-text'>
           <i className='anticon anticon-check-round'></i>
         </span>
-      )
+      );
     }else {
       progressInfo = (
         <span className='ant-progress-line-text'>{this.props.percent}%</span>
-      )
+      );
     }
 
     return (
       <div className='ant-progress-line-wrap' style={wrapStyle}>
         <div className='ant-progress-line-inner' style={style}>
           <Progressline percent={this.props.percent} strokeWidth={this.props.strokeWidth}
-                        strokeColor={statusColorMap[this.props.status]}/>
+                        strokeColor={statusColorMap[this.props.status]} trailColor="#e9e9e9" />
         </div>
         {progressInfo}
       </div>
@@ -67,9 +67,9 @@ var Circle = React.createClass({
   getDefaultProps: function () {
     return {
       percent: 0,
-      strokeWidth: 2,
+      strokeWidth: 4,
       status: 'normal' // exception
-    }
+    };
   },
   render() {
     var statusColorMap = {
@@ -79,37 +79,37 @@ var Circle = React.createClass({
     };
 
     if (parseInt(this.props.percent) === 100) {
-      this.props.status = 'success'
+      this.props.status = 'success';
     }
 
     var style = {
       'width': this.props.width,
       'height': this.props.width
-    }
+    };
     var wrapStyle = {
       'font-size': this.props.width * 0.3
-    }
+    };
     var textStyle = {
       'color': statusColorMap[this.props.status]
-    }
+    };
-    var progressInfo
+    var progressInfo;
     if (this.props.status === 'exception') {
       progressInfo = (
         <span style={textStyle} className='ant-progress-circle-text'>
           <i className='anticon anticon-exclamation'></i>
         </span>
-      )
+      );
     }else {
       progressInfo = (
         <span className="ant-progress-circle-text">{this.props.percent}%</span>
-      )
+      );
     }
 
     return (
       <div className="ant-progress-circle-wrap" style={wrapStyle}>
         <div className="ant-progress-circle-inner" style={style}>
           <Progresscircle percent={this.props.percent} strokeWidth={this.props.strokeWidth}
-                        strokeColor={statusColorMap[this.props.status]}/>
+                        strokeColor={statusColorMap[this.props.status]} trailColor="#e9e9e9" />
           {progressInfo}
         </div>
       </div>

components/progress/index.md

@@ -8,15 +8,15 @@
 
 ## 使用
 
-`<Line perscent="30" />`
+`<Line percent="30" />`
 
-`<Circle perscent="30" />`
+`<Circle percent="30" />`
 
 ## 属性参数
 
 | 参数     | 说明           | 类型     | 默认值       |
 |----------|----------------|----------|--------------|
-| perscent    | 百分比           | number   | 0           |
+| percent    | 百分比           | number   | 0           |
 | status   | 状态，有两个值normal、exception | string   | normal |
 | strokeWidth | 进度条线宽度，单位是进度条画布宽度的百分比 | number | 1           |
 | width | 必填，进度条画布宽度，单位px。这里没有提供height属性设置，Line型高度就是strokeWidth，Circle型高度等于width | number | null |