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

.eslintrc.js

@@ -26,7 +26,6 @@ const eslintrc = {
     'func-names': 0,
     'prefer-const': 0,
     'arrow-body-style': 0,
-    'object-shorthand': 0,
     'react/sort-comp': 0,
     'react/prop-types': 0,
     'react/jsx-closing-bracket-location': 0,

components/input-number/style/index.less

@@ -7,11 +7,7 @@
 .handler-disabled() {
   opacity: 0.72;
   color: #ccc !important;
-  cursor: default;
+  cursor: not-allowed;
-  &:hover {
-    color: #ccc;
-    cursor: default;
-  }
 }
 
 .@{input-number-prefix-cls} {

docs/practice/cases.md

@@ -60,7 +60,7 @@ OceanBase 是一款真正意义上的云端分布式关系型数据库，而 Oce
 
 AntV 将数据图形小组近几年在探索数据可视化过程中取得的成果进行总结和沉淀，并分享给所有需要数据可视理论的人。
 
-<p><a class="outside-link internal" href="http://antv.alipay.net/" target="_blank">立即访问</a></p>
+<p><a class="outside-link internal" href="https://antv.alipay.com/" target="_blank">立即访问</a></p>
 
 <style>
 .preview-image-boxes {

site/component/Footer/index.jsx

@@ -38,6 +38,8 @@ export default class Footer extends React.Component {
           </li>
           <li>
             <h2>相关站点</h2>
+            <div><a href="https://g2.alipay.com/">G2</a> - 数据可视化</div>
+            <div><a href="https://antv.alipay.com/">AntV</a> - 数据可视化规范</div>
             <div><a href="http://motion.ant.design">Ant Motion</a> - 设计动效</div>
             <div><a href="http://motion.ant.design">Ant UX</a> - 页面逻辑素材</div>
           </li>