mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-28 13:09:40 +08:00
Code Issues Actions 50 Packages Projects Releases Wiki Activity

Merge branch 'master' into antd-3.0

Browse Source
This commit is contained in:
afc163 2017-09-25 23:10:42 +08:00
commit f9754c8a25
8 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/form/style/index.less
View File

@ -519,7 +519,7 @@ form {
border-color: @error-color;
}
}
&.@{ant-prefix}-mention-active .@{ant-prefix}-mention-editor,
&.@{ant-prefix}-mention-active:not([disabled]) .@{ant-prefix}-mention-editor,
.@{ant-prefix}-mention-editor:not([disabled]):focus {
.active(@error-color);
}

2
components/mention/demo/async.md
View File

@ -43,7 +43,7 @@ class AsyncMention extends React.Component {
const { suggestions, loading } = this.state;
return (
<Mention
style={{ width: '100%', height: 100 }}
style={{ width: '100%' }}
loading={loading}
suggestions={suggestions}
onSearchChange={this.onSearchChange}

2
components/mention/demo/avatar.md
View File

@ -53,7 +53,7 @@ class CustomNavMention extends React.Component {
const { suggestions } = this.state;
return (
<Mention
style={{ width: '100%', height: 100 }}
style={{ width: '100%' }}
suggestions={suggestions}
onSearchChange={this.onSearchChange}
/>

2
components/mention/demo/basic.md
View File

@ -27,7 +27,7 @@ function onSelect(suggestion) {
ReactDOM.render(
<Mention
style={{ width: '100%', height: 100 }}
style={{ width: '100%' }}
onChange={onChange}
defaultValue={toContentState('@afc163')}
suggestions={['afc163', 'benjycui', 'yiminghe', 'RaoHai', '中文', 'にほんご']}

1
components/mention/demo/controlled.md
View File

@ -65,7 +65,6 @@ class App extends React.Component {
})(
<Mention
suggestions={['afc163', 'benjycui', 'yiminghe', 'RaoHai', '中文', 'にほんご']}
style={{ height: 60 }}
/>
)}
</FormItem>

2
components/mention/demo/custom-tag.md
View File

@ -55,7 +55,7 @@ class CustomNavMention extends React.Component {
return (
<Mention
placeholder="@someone"
style={{ width: '100%', height: 100 }}
style={{ width: '100%' }}
suggestions={suggestions}
onSearchChange={this.onSearchChange}
onSelect={onSelect}

2
components/mention/demo/multiple-trigger.md
View File

@ -45,7 +45,7 @@ class App extends React.Component {
render() {
return (
<Mention
style={{ width: '100%', height: 100 }}
style={{ width: '100%' }}
onChange={onChange}
placeholder="input @ to mention people, # to mention tag"
prefix={['@', '#']}

2
components/mention/demo/popupContainer.md
View File

@ -32,7 +32,7 @@ class PopoverContainer extends React.Component {
render() {
const mention = (
<Mention
style={{ width: '100%', height: 100 }}
style={{ width: '100%' }}
onChange={onChange}
defaultValue={toContentState('@afc163')}
suggestions={['afc163', 'benjycui', 'yiminghe', 'RaoHai', '中文', 'にほんご']}