Merge branch 'master' into antd-3.0

components/anchor/style/index.less

@@ -43,7 +43,7 @@
     display: none;
   }
 
-  &-anchor-link {
+  &-link {
     padding: 8px 0 8px 18px;
     line-height: 1;
 
@@ -67,7 +67,7 @@
     }
   }
 
-  &-anchor-link &-anchor-link {
+  &-link &-link {
     padding-top: 6px;
     padding-bottom: 6px;
   }

components/button/button.tsx

@@ -146,7 +146,7 @@ export default class Button extends React.Component<ButtonProps, any> {
       [`${prefixCls}-${type}`]: type,
       [`${prefixCls}-${shape}`]: shape,
       [`${prefixCls}-${sizeCls}`]: sizeCls,
-      [`${prefixCls}-icon-only`]: !children && icon && !loading,
+      [`${prefixCls}-icon-only`]: !children && icon,
       [`${prefixCls}-loading`]: loading,
       [`${prefixCls}-clicked`]: clicked,
       [`${prefixCls}-background-ghost`]: ghost,

components/button/style/index.less

@@ -94,7 +94,7 @@
     display: block;
   }
 
-  &&-loading:not(&-circle):not(&-circle-outline) {
+  &&-loading:not(&-circle):not(&-circle-outline):not(&-icon-only) {
     padding-left: 29px;
     pointer-events: none;
     position: relative;
@@ -103,7 +103,7 @@
     }
   }
 
-  &-sm&-loading:not(&-circle):not(&-circle-outline) {
+  &-sm&-loading:not(&-circle):not(&-circle-outline):not(&-icon-only) {
     padding-left: 24px;
     .@{iconfont-css-prefix} {
       margin-left: -17px;

components/mention/index.tsx

@@ -80,7 +80,14 @@ export default class Mention extends React.Component<MentionProps, MentionState>
   defaultSearchChange(value: String): void {
     const searchValue = value.toLowerCase();
     const filteredSuggestions = (this.props.suggestions || []).filter(
-      suggestion => suggestion.toLowerCase().indexOf(searchValue) !== -1,
+      suggestion => {
+        if (suggestion.type && suggestion.type === Nav) {
+          return suggestion.props.value ?
+            suggestion.props.value.toLowerCase().indexOf(searchValue) !== -1
+            : true;
+        }
+        return suggestion.toLowerCase().indexOf(searchValue) !== -1;
+      },
     );
     this.setState({
       suggestions: filteredSuggestions,

components/select/style/index.less

@@ -240,6 +240,14 @@
     left: 8px;
   }
 
+  &-search__field__mirror {
+    position: absolute;
+    top: 0;
+    left: -9999px;
+    white-space: pre;
+    pointer-events: none;
+  }
+
   &-search--inline {
     position: absolute;
     height: 100%;
@@ -266,14 +274,6 @@
       line-height: 1;
     }
 
-    .@{select-prefix-cls}-search__field__mirror {
-      position: absolute;
-      top: 0;
-      left: -9999px;
-      white-space: pre;
-      pointer-events: none;
-    }
-
     > i {
       float: right;
     }

components/style/core/iconfont.less

@@ -1,5 +1,7 @@
+@import '../themes/default';
+@import "../mixins/iconfont";
+
 // font-face
-// @icon-url： 字体源文件的地址
 @font-face {
   font-family: 'anticon';
   src: url('@{icon-url}.eot'); /* IE9*/