From fdba67e6135facd0f7e0cd4a4f0f60b03c504769 Mon Sep 17 00:00:00 2001
From: zuiidea <zuiiidea@gmail.com>
Date: Sun, 25 Dec 2016 18:57:57 +0800
Subject: [PATCH] ico

---
 src/components/ui/ico.js   | 10 +++++-----
 src/components/ui/ico.less |  3 ++-
 src/components/ui/index.js |  3 +++
 src/routes/ui/ico.js       |  9 ++++++++-
 src/routes/ui/ico.less     | 38 ++++++++++++++++++++++++++++++++------
 src/utils/menu.js          |  2 +-
 6 files changed, 51 insertions(+), 14 deletions(-)
 create mode 100644 src/components/ui/index.js

diff --git a/src/components/ui/ico.js b/src/components/ui/ico.js
index a0e43ec..2e48ec9 100644
--- a/src/components/ui/ico.js
+++ b/src/components/ui/ico.js
@@ -1,8 +1,8 @@
-import React, { PropTypes } from 'react'
-import styles form './ico.less'
+import React, {PropTypes} from 'react'
+import styles from './ico.less'
 
-const Ico = (type) => <svg className={styles.ico} aria-hidden="true">
-    <use xlink:href={`#icon-${type}`}></use>
-</svg>
+const Ico = ({type}) => <span dangerouslySetInnerHTML={{
+  __html: `<svg class="ico" aria-hidden="true"><use xlink:href="#anticon-${type}"></use></svg>`
+}}/>
 
 export default Ico
diff --git a/src/components/ui/ico.less b/src/components/ui/ico.less
index 44aa4a0..9cebc1e 100644
--- a/src/components/ui/ico.less
+++ b/src/components/ui/ico.less
@@ -1,7 +1,8 @@
-.ico {
+:global .ico {
   width: 1em;
   height: 1em;
   vertical-align: -0.15em;
   fill: currentColor;
   overflow: hidden;
+  font-size: 16px;
 }
diff --git a/src/components/ui/index.js b/src/components/ui/index.js
new file mode 100644
index 0000000..09e29fd
--- /dev/null
+++ b/src/components/ui/index.js
@@ -0,0 +1,3 @@
+import Ico from './ico.js'
+
+export {Ico}
diff --git a/src/routes/ui/ico.js b/src/routes/ui/ico.js
index 2bef51e..d391a2c 100644
--- a/src/routes/ui/ico.js
+++ b/src/routes/ui/ico.js
@@ -1,6 +1,13 @@
 import React, { PropTypes } from 'react'
+import {Ico} from '../../components/ui'
+import styles from './ico.less'
 
-const IcoPage = () => <div>666</div>
+const iconlist = ['Cherry','Cheese','Bread','Beer','Beet','Bacon','Banana','Asparagus','Apple']
 
+const IcoPage = () => <div className="content-inner">
+  <ul className={styles.list}>
+    {iconlist.map ( item =><li key={item}><Ico className={styles.icon} type={item} /><span className={styles.name}>{item}</span></li>)}
+  </ul>
+</div>
 
 export default IcoPage
diff --git a/src/routes/ui/ico.less b/src/routes/ui/ico.less
index 44aa4a0..e0401ff 100644
--- a/src/routes/ui/ico.less
+++ b/src/routes/ui/ico.less
@@ -1,7 +1,33 @@
-.ico {
-  width: 1em;
-  height: 1em;
-  vertical-align: -0.15em;
-  fill: currentColor;
-  overflow: hidden;
+.list {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  margin-right: -24px;
+
+  li {
+    width: 160px;
+    text-align: center;
+    cursor: pointer;
+    height: 100px;
+    transition: all 0.5s ease;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin-right: 24px;
+    margin-bottom: 24px;
+    box-sizing: border-box;
+    border: solid 1px transparent;
+
+    &:hover{
+      border: solid 1px #f5f5f5;
+    }
+  }
+
+  .name {
+    margin-top: 16px;
+  }
+
+  :global .ico {
+    font-size: 48px;
+  }
 }
diff --git a/src/utils/menu.js b/src/utils/menu.js
index 8bdda9f..b15fef5 100644
--- a/src/utils/menu.js
+++ b/src/utils/menu.js
@@ -12,7 +12,7 @@ module.exports = [
   {
     key: 'ui',
     name: 'UI组件',
-    icon: 'laptop',
+    icon: 'camera-o',
     clickable:false,
     child:[
       {