From e058e67cb4602412b15339aa438b060bb74fe393 Mon Sep 17 00:00:00 2001 From: afc163 Date: Fri, 20 Nov 2015 11:05:34 +0800 Subject: [PATCH] fix iconfont --- components/alert/index.jsx | 2 +- components/{iconfont => icon}/index.jsx | 0 components/{iconfont => icon}/index.md | 2 +- components/message/index.jsx | 2 +- components/modal/confirm.jsx | 2 +- components/notification/index.jsx | 2 +- components/popconfirm/index.jsx | 2 +- components/progress/index.jsx | 2 +- components/table/filterDropdown.jsx | 2 +- components/table/index.jsx | 2 +- components/tag/index.jsx | 2 +- components/upload/uploadList.jsx | 2 +- index.js | 2 +- style/core/iconfont.less | 2 +- 14 files changed, 13 insertions(+), 13 deletions(-) rename components/{iconfont => icon}/index.jsx (100%) rename components/{iconfont => icon}/index.md (98%) diff --git a/components/alert/index.jsx b/components/alert/index.jsx index 0806e9390c..e29dcf300f 100644 --- a/components/alert/index.jsx +++ b/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() { diff --git a/components/iconfont/index.jsx b/components/icon/index.jsx similarity index 100% rename from components/iconfont/index.jsx rename to components/icon/index.jsx diff --git a/components/iconfont/index.md b/components/icon/index.md similarity index 98% rename from components/iconfont/index.md rename to components/icon/index.md index 2fce5782af..de564e26fa 100644 --- a/components/iconfont/index.md +++ b/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']; diff --git a/components/message/index.jsx b/components/message/index.jsx index 13ccda5bf1..10f8ecd4c2 100644 --- a/components/message/index.jsx +++ b/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; diff --git a/components/modal/confirm.jsx b/components/modal/confirm.jsx index e1006e5eea..62004b8b13 100644 --- a/components/modal/confirm.jsx +++ b/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) { diff --git a/components/notification/index.jsx b/components/notification/index.jsx index e5a97a9c3a..ab7cb49756 100644 --- a/components/notification/index.jsx +++ b/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; diff --git a/components/popconfirm/index.jsx b/components/popconfirm/index.jsx index b88b668b7a..5bc680f373 100644 --- a/components/popconfirm/index.jsx +++ b/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'; diff --git a/components/progress/index.jsx b/components/progress/index.jsx index 95501640f1..8212674209 100644 --- a/components/progress/index.jsx +++ b/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'; diff --git a/components/table/filterDropdown.jsx b/components/table/filterDropdown.jsx index 9474d53237..cdf8b00f81 100644 --- a/components/table/filterDropdown.jsx +++ b/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() { diff --git a/components/table/index.jsx b/components/table/index.jsx index b82c75238b..6ea271d39a 100644 --- a/components/table/index.jsx +++ b/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'; diff --git a/components/tag/index.jsx b/components/tag/index.jsx index 8f5192942d..cb79983d74 100644 --- a/components/tag/index.jsx +++ b/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) { diff --git a/components/upload/uploadList.jsx b/components/upload/uploadList.jsx index 2d33d6c2e3..706b9e4fb5 100644 --- a/components/upload/uploadList.jsx +++ b/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'; diff --git a/index.js b/index.js index 04479d5d17..61b54e3125 100644 --- a/index.js +++ b/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'), diff --git a/style/core/iconfont.less b/style/core/iconfont.less index ffdd8f3a98..d238c22122 100644 --- a/style/core/iconfont.less +++ b/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";}