Merge 0017481 into 2ffc8cc

uxcore · Jan 23, 2019 · c24e913 · c24e913
2 parents 2ffc8cc + 0017481
commit c24e913
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,8 @@
 # history
 
+## 0.1.27 / 2019-01-23
+* `CHANGED` add 1 new icon menu
+
 ## 0.1.26 / 2019-01-18
 * `CHANGED` add 1 new icon drag
 

diff --git a/README.md b/README.md
@@ -58,21 +58,20 @@ npm run test
 npm run coverage
 ```
 
-## Demo
+## Usage
 
-http://uxcore.github.io/components/icon
-
-## Contribute
-
-Yes please! See the [CONTRIBUTING](https://github.com/uxcore/uxcore/blob/master/CONTRIBUTING.md) for details.
-
-## API
+`<Icon usei name="menu" />`
 
 ## Props
 
 | Name | Type | Required | Default | Comments |
 |---|---|---|---|---|
+|usei|bool|no|false| 使用 `<i>` 标签渲染 ICON，建议开启 |
 |name|string|no|shezhi| 图标名字 |
 |className|string|no| | 额外类名 |
 
 其他 props 将透传给 icon 元素
+
+## Contribute
+
+Yes please! See the [CONTRIBUTING](https://github.com/uxcore/uxcore/blob/master/CONTRIBUTING.md) for details.
diff --git a/demo/IconDemo.jsx b/demo/IconDemo.jsx
@@ -188,6 +188,7 @@ const icons = [
   'zhongyaoshijian',
   'drag',
   'more-dot',
+  'menu',
 ];
 class Demo extends React.Component {
   constructor(props) {

diff --git a/src/Icon.less b/src/Icon.less
@@ -8,7 +8,7 @@
 
 @font-face {
   font-family: 'uxcore';
-  src: url('//at.alicdn.com/t/font_207195_8afmavfl3d8.woff') format('woff');
+  src: url('//at.alicdn.com/t/font_207195_8eaexql2ap.woff') format('woff');
 }
 
 .uxcore-icon {
@@ -350,3 +350,5 @@
 .uxicon-drag:before { content: "\e6ad"; }
 
 .uxicon-more-dot:before { content: "\e6a0"; }
+
+.uxicon-menu:before { content: "\e6cd"; }