mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-06-12 20:43:11 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

Merge branch 'master' into antd-3.0

Browse Source
This commit is contained in:
afc163 2017-09-23 16:50:14 +08:00
commit c9069dfdf6
6 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/anchor/style/index.less
View File

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

2
components/button/button.tsx
View File

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

4
components/button/style/index.less
View File

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

9
components/mention/index.tsx
View File

@ -80,7 +80,14 @@ export default class Mention extends React.Component<MentionProps, MentionState>
defaultSearchChange(value: String): void { defaultSearchChange(value: String): void {
const searchValue = value.toLowerCase(); const searchValue = value.toLowerCase();
const filteredSuggestions = (this.props.suggestions || []).filter( 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({ this.setState({
suggestions: filteredSuggestions, suggestions: filteredSuggestions,

16
components/select/style/index.less
View File

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

4
components/style/core/iconfont.less
View File

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