diff --git a/components/iconfont/index.md b/components/iconfont/index.md
index 50fe6f5cc3..d7cbd6f6a2 100644
--- a/components/iconfont/index.md
+++ b/components/iconfont/index.md
@@ -3,7 +3,6 @@
- category: Components
- chinese: 字体图标
- type: 基本
-- noinstant: true
---
@@ -41,486 +40,16 @@
### 一. 方向性图标
-
- -
-
- 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
-
-
+
### 二. 提示建议性图标
-
- -
-
- 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
-
-
+
### 三. 网站通用图标
-
- -
-
- lock
-
- -
-
- unlock
-
- -
-
- android
-
- -
-
- apple
-
- -
-
- area-chart
-
- -
-
- bar-chart
-
- -
-
- bars
-
- -
-
- book
-
- -
-
- calendar
-
- -
-
- cloud
-
- -
-
- cloud-download
-
- -
-
- code
-
- -
-
- copy
-
- -
-
- credit-card
-
- -
-
- delete
-
- -
-
- desktop
-
- -
-
- download-line
-
- -
-
- edit
-
- -
-
- ellipsis
-
- -
-
- environment
-
- -
-
- file
-
- -
-
- file-text
-
- -
-
- folder
-
- -
-
- folder-open
-
- -
-
- github
-
- -
-
- hdd
-
- -
-
- frown
-
- -
-
- meh
-
- -
-
- inbox
-
- -
-
- laptop
-
- -
-
- appstore
-
- -
-
- line-chart
-
- -
-
- link
-
- -
-
- logout
-
- -
-
- mail
-
- -
-
- menu-fold
-
- -
-
- menu-unfold
-
- -
-
- mobile
-
- -
-
- notification
-
- -
-
- paper-clip
-
- -
-
- picture
-
- -
-
- pie-chart
-
- -
-
- poweroff
-
- -
-
- reload
-
- -
-
- search
-
- -
-
- setting
-
- -
-
- share-alt
-
- -
-
- shopping-cart
-
- -
-
- smile
-
- -
-
- tablet
-
- -
-
- tag
-
- -
-
- tags
-
- -
-
- to-top
-
- -
-
- upload
-
- -
-
- user
-
- -
-
- video-camera
-
- -
-
- windows
-
- -
-
- ie
-
- -
-
- chrome
-
- -
-
- home
-
- -
-
- loading
-
-
+
+
-
-
+
+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'];
+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'];
+const icons3 = ['lock', 'unlock', 'android', 'apple', 'area-chart', 'bar-chart', 'bars', 'book', 'calendar', 'cloud', 'cloud-download', 'code', 'copy', 'credit-card', 'delete', 'desktop', 'download-line', 'edit', 'ellipsis', 'environment', 'file', 'file-text', 'folder', 'folder-open', 'github', 'hdd', 'frown', 'meh', 'inbox', 'laptop', 'appstore', 'line-chart', 'link', 'logout', 'mail', 'menu-fold', 'menu-unfold', 'mobile', 'notification', 'paper-clip', 'picture', 'pie-chart', 'poweroff', 'reload', 'search', 'setting', 'share-alt', 'shopping-cart', 'smile', 'tablet', 'tag', 'tags', 'to-top', 'upload', 'user', 'video-camera', 'windows', 'ie', 'chrome', 'home', 'loading'];
+
+ReactDOM.render(, document.getElementById('iconset-direction'));
+ReactDOM.render(, document.getElementById('iconset-hint'));
+ReactDOM.render(, document.getElementById('iconset-common'));
+`````
diff --git a/scripts/clip.js b/scripts/clip.js
index a6b9f9f27a..c574b3fd02 100644
--- a/scripts/clip.js
+++ b/scripts/clip.js
@@ -57,18 +57,13 @@ class Clip extends React.Component {
render() {
let dataAttributes = this.propsWith(/^data-/);
- let attributes = this.propsWith(/^span-/, true);
- return (
-
- {this.props.children}
-
- );
+ let component = this.props.component || 'span';
+ return React.createElement(component, {
+ id: this.id,
+ className: this.props.className || '',
+ style: this.props.style || {},
+ ...dataAttributes
+ }, this.props.children);
}
}
diff --git a/site/templates/layout.html b/site/templates/layout.html
index f3b1b05758..fb6e71a8d7 100644
--- a/site/templates/layout.html
+++ b/site/templates/layout.html
@@ -69,6 +69,7 @@
return result;
};
+
{% block scripts %}{% endblock %}
diff --git a/spec/colors.md b/spec/colors.md
index 3b90a58044..1db0764975 100644
--- a/spec/colors.md
+++ b/spec/colors.md
@@ -194,9 +194,6 @@ ReactDOM.render(, document.getElementById('extend-palettes'));
## 色彩换算工具
-
-
-
> 正数为变淡 `tint` ，负数为加深 `shade`。
@@ -206,7 +203,6 @@ Ant Design 专用色彩换算工具，用于解析类似 `#2db7f5 tint 80%` 的
less 或 scss 语言可以直接使用 `tint(#2db7f5, 80%)` 和 `shade(#2db7f5, 80%)` 的语法。
-
`````jsx
let Button = antd.Button;
let InputNumber = antd.InputNumber;
@@ -215,7 +211,7 @@ let Tooltip = antd.Tooltip;
let TintShadeTool = React.createClass({
getInitialState() {
return {
- result: '',
+ result: '#2db7f5',
color: '#2db7f5',
value: 80
};
@@ -257,7 +253,7 @@ let TintShadeTool = React.createClass({
- {this.state.result}
+ {this.state.result}
%