fix iconfont

components/alert/index.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import Animate from 'rc-animate';
-import Icon from '../iconfont';
+import Icon from '../icon';
 
 export default React.createClass({
   getDefaultProps() {

components/iconfont/index.md → components/icon/index.md

@@ -153,7 +153,7 @@ const IconSet = React.createClass({
   }
 });
 
-const icons1 = ['step-backward', 'step-forward', 'fast-backward', 'fast-forward', 'shrink', 'arrow-salt', 'down', 'up', 'left', 'right', 'caret-down', 'caret-up', 'caret-left', 'caret-right', 'caret-circle-right', 'caret-circle-left', 'caret-circle-o-right', 'caret-circle-o-left', 'circle-right', 'circle-left', 'circle-o-right', 'circle-o-left', 'double-right', 'double-left', 'verticle-right', 'verticle-left', 'forward', 'backward', 'rollback', 'retweet', 'swap', 'swap-left', 'swap-right', 'arrow-right', 'arrow-up', 'arrow-down', 'arrow-left', 'play-circle', 'play-circle-o', 'circle-up', 'circle-down', 'circle-o-up', 'circle-o-down', 'caret-circle-o-down', 'caret-circle-up', 'caret-circle-down', 'iconfont-caretcircle-o-up'];
+const icons1 = ['step-backward', 'step-forward', 'fast-backward', 'fast-forward', 'shrink', 'arrow-salt', 'down', 'up', 'left', 'right', 'caret-down', 'caret-up', 'caret-left', 'caret-right', 'caret-circle-right', 'caret-circle-left', 'caret-circle-o-right', 'caret-circle-o-left', 'circle-right', 'circle-left', 'circle-o-right', 'circle-o-left', 'double-right', 'double-left', 'verticle-right', 'verticle-left', 'forward', 'backward', 'rollback', 'retweet', 'swap', 'swap-left', 'swap-right', 'arrow-right', 'arrow-up', 'arrow-down', 'arrow-left', 'play-circle', 'play-circle-o', 'circle-up', 'circle-down', 'circle-o-up', 'circle-o-down', 'caret-circle-o-up', 'caret-circle-o-down', 'caret-circle-up', 'caret-circle-down'];
 
 const icons2 = ['question', 'question-circle-o', 'question-circle', 'plus', 'plus-circle-o', 'plus-circle', 'pause', 'pause-circle-o', 'pause-circle', 'minus', 'minus-circle-o', 'minus-circle', 'info', 'info-circle-o', 'info-circle', 'exclamation', 'exclamation-circle-o', 'exclamation-circle', 'cross', 'cross-circle-o', 'cross-circle', 'check', 'check-circle-o', 'check-circle', 'clock-circle-o', 'clock-circle'];
 

components/message/index.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import Notification from 'rc-notification';
-import Icon from '../iconfont';
+import Icon from '../icon';
 
 let defaultDuration = 1.5;
 let top;

components/modal/confirm.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import Dialog from './index';
-import Icon from '../iconfont';
+import Icon from '../icon';
 import Button from '../button';
 
 export default function (props) {

components/notification/index.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import Notification from 'rc-notification';
 import assign from 'object-assign';
-import Icon from '../iconfont';
+import Icon from '../icon';
 
 let top = 24;
 let notificationInstance;

components/popconfirm/index.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import Tooltip from 'rc-tooltip';
-import Icon from '../iconfont';
+import Icon from '../icon';
 import Button from '../button';
 const prefixCls = 'ant-popover';
 

components/progress/index.jsx

@@ -1,7 +1,7 @@
 import {Circle as Progresscircle} from 'rc-progress';
 import React from 'react';
 import assign from 'object-assign';
-import Icon from '../iconfont';
+import Icon from '../icon';
 
 const prefixCls = 'ant-progress';
 

components/table/filterDropdown.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import Menu from 'rc-menu';
 import Dropdown from '../dropdown';
-import Icon from '../iconfont';
+import Icon from '../icon';
 
 let FilterMenu = React.createClass({
   getInitialState() {

components/table/index.jsx

@@ -5,7 +5,7 @@ import Checkbox from '../checkbox';
 import Radio from '../radio';
 import FilterDropdown from './filterDropdown';
 import Pagination from '../pagination';
-import Icon from '../iconfont';
+import Icon from '../icon';
 import objectAssign from 'object-assign';
 import Spin from '../spin';
 

components/tag/index.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import Animate from 'rc-animate';
-import Icon from '../iconfont';
+import Icon from '../icon';
 
 class AntTag extends React.Component {
   constructor(props) {

components/upload/uploadList.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import Animate from 'rc-animate';
-import Icon from '../iconfont';
+import Icon from '../icon';
 const prefixCls = 'ant-upload';
 import { Line } from '../progress';
 

index.js

@@ -37,7 +37,7 @@ const antd = {
   Timeline: require('./components/timeline'),
   Button: require('./components/button'),
   ButtonGroup: require('./components/button').Group,
-  Icon: require('./components/iconfont'),
+  Icon: require('./components/icon'),
   Row: require('./components/layout').Row,
   Col: require('./components/layout').Col,
   Spin: require('./components/spin'),

style/core/iconfont.less

@@ -15,7 +15,7 @@
  .iconfont-mixin();
 }
 
-.@{iconfont-css-prefix}-iconfont-caretcircle-o-up:before{content:"\e60c";}
+.@{iconfont-css-prefix}-caret-circle-o-up:before        {content:"\e60c";}
 .@{iconfont-css-prefix}-android:before                  {content:"\e64f";}
 .@{iconfont-css-prefix}-chrome:before                   {content:"\e65c";}
 .@{iconfont-css-prefix}-appstore:before                 {content:"\e64d";}