Merge branch 'master' of github.com:ant-design/ant-design

components/iconfont/index.md

@@ -498,7 +498,6 @@ ul.anticons-list {
 ul.anticons-list li {
   float: left;
   margin: 5px 5px 5px 0;
-  padding-bottom: 10px;
   width: 155px;
   text-align: center;
   list-style: none;
@@ -507,6 +506,7 @@ ul.anticons-list li {
   color: #5C6B77;
   transition: all 0.2s ease;
   position: relative;
+  padding: 0;
 }
 ul.anticons-list li:hover,
 ul.anticons-list li.zeroclipboard-is-hover {
@@ -536,7 +536,7 @@ ul.anticons-list li.copied:after {
 }
 .anticon {
   font-size: 26px;
-  margin: 26px 0 16px;
+  margin: 12px 0 16px;
 }
 .anticon-class {
   display: block;

components/tabs/index.jsx

@@ -10,7 +10,7 @@ class AntTabs extends React.Component {
 }
 
 AntTabs.defaultProps = {
-  prefixCls: 'ant-tab'
+  prefixCls: 'ant-tabs'
 };
 
 AntTabs.TabPane = Tabs.TabPane;

style/components/tabs.less

-@prefixClass: ant-tab;
+@prefixClass: ant-tabs;
 
 @easing-in-out: cubic-bezier(0.35, 0, 0.25, 1);
 
@@ -123,7 +123,7 @@
 
     div.@{prefixClass}-tab-active {
       > a, > a:hover, > a:focus {
-        font-weight: bold;
+        color: fadeout(#2db7f5, 20%);
         cursor: pointer;
         text-decoration: none;
       }
@@ -161,7 +161,7 @@
       }
 
       > a:hover {
-        color: #23c0fa;
+        color: fadeout(#2db7f5, 30%);
         cursor: pointer;
       }