From b9fa8d1a45ebe3219d3fb8157b355ae971fc6f15 Mon Sep 17 00:00:00 2001 From: elrrrrrrr Date: Fri, 2 Oct 2015 15:58:37 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E8=BF=81=E7=A7=BB=20progress=20iconfo?= =?UTF-8?q?nt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/popconfirm/index.jsx | 3 ++- components/progress/demo/circle-dynamic.md | 5 +++-- components/progress/demo/dynamic.md | 5 +++-- components/progress/index.jsx | 9 +++++---- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/components/popconfirm/index.jsx b/components/popconfirm/index.jsx index 33d419ad4a..fd969ad59c 100644 --- a/components/popconfirm/index.jsx +++ b/components/popconfirm/index.jsx @@ -1,5 +1,6 @@ import React from 'react'; import Tooltip from 'rc-tooltip'; +import Icon from '../iconfont'; const prefixCls = 'ant-popover'; export default React.createClass({ @@ -41,7 +42,7 @@ export default React.createClass({ const overlay =

- + {this.props.title}

diff --git a/components/progress/demo/circle-dynamic.md b/components/progress/demo/circle-dynamic.md index aeee518cbf..37a94fb84c 100644 --- a/components/progress/demo/circle-dynamic.md +++ b/components/progress/demo/circle-dynamic.md @@ -8,6 +8,7 @@ ````jsx var ProgressCircle = antd.Progress.Circle; +var Icon = antd.Icon; var MyProgress = React.createClass({ getInitialState() { @@ -34,10 +35,10 @@ var MyProgress = React.createClass({
; diff --git a/components/progress/demo/dynamic.md b/components/progress/demo/dynamic.md index de65e97f74..3e93767d1d 100644 --- a/components/progress/demo/dynamic.md +++ b/components/progress/demo/dynamic.md @@ -8,6 +8,7 @@ ````jsx var Progress = antd.Progress.Line; +var Icon = antd.Icon; var MyProgress = React.createClass({ getInitialState() { @@ -34,10 +35,10 @@ var MyProgress = React.createClass({
; diff --git a/components/progress/index.jsx b/components/progress/index.jsx index d5042cd482..e9b9c3472c 100644 --- a/components/progress/index.jsx +++ b/components/progress/index.jsx @@ -1,6 +1,7 @@ import {Circle as Progresscircle} from 'rc-progress'; import React from 'react'; import assign from 'object-assign'; +import Icon from '../iconfont'; const prefixCls = 'ant-progress'; @@ -38,13 +39,13 @@ let Line = React.createClass({ if (props.status === 'exception') { progressInfo = ( - + ); } else if (props.status === 'success') { progressInfo = ( - + ); } else { @@ -98,13 +99,13 @@ let Circle = React.createClass({ if (props.status === 'exception') { progressInfo = ( - + ); } else if (props.status === 'success') { progressInfo = ( - + ); } else {