Skip to content

Commit 45bb45f

Browse files
e1emeb0tsam019
authored andcommitted
1.4.0 release
1 parent 4e8e0d3 commit 45bb45f

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
},
3333
"homepage": "https://github.com/eleme/element-react",
3434
"devDependencies": {
35-
"@types/react": "^15.6.1",
35+
"@types/react": "^16.0.19",
3636
"babel-cli": "^6.26.0",
3737
"babel-eslint": "^7.2.3",
38-
"babel-jest": "^20.0.3",
38+
"babel-jest": "^21.2.0",
3939
"babel-loader": "^7.1.2",
4040
"babel-plugin-transform-runtime": "^6.23.0",
4141
"babel-preset-es2015": "^6.24.1",
@@ -46,7 +46,7 @@
4646
"codemirror": "^5.31.0",
4747
"core-js": "^2.5.1",
4848
"css-loader": "^0.28.7",
49-
"element-theme-default": "^1.4.8",
49+
"element-theme-default": "^1.4.9",
5050
"enzyme": "^3.1.0",
5151
"enzyme-adapter-react-16": "^1.0.2",
5252
"eslint": "^3.19.0",
@@ -56,10 +56,10 @@
5656
"eslint-plugin-jsx-a11y": "^5.1.0",
5757
"eslint-plugin-react": "^7.0.1",
5858
"extract-text-webpack-plugin": "^3.0.2",
59-
"file-loader": "^0.11.2",
59+
"file-loader": "^1.1.5",
6060
"flow-bin": "^0.51.1",
6161
"html-webpack-plugin": "^2.30.1",
62-
"jest": "^20.0.4",
62+
"jest": "^21.2.1",
6363
"marked": "^0.3.6",
6464
"mock-raf": "^1.0.0",
6565
"node-sass": "^4.5.3",
@@ -69,9 +69,9 @@
6969
"react-scroll-up": "^1.3.3",
7070
"regenerator-runtime": "^0.11.0",
7171
"sass-loader": "^6.0.5",
72-
"sinon": "^2.4.1",
72+
"sinon": "^4.0.2",
7373
"style-loader": "^0.19.0",
74-
"typescript": "^2.5.0",
74+
"typescript": "^2.6.1",
7575
"url-loader": "^0.6.2",
7676
"webpack": "^3.8.1",
7777
"webpack-dev-server": "^2.9.3"

src/form/FormItem.jsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,8 @@ export default class FormItem extends Component {
210210
}
211211
<div className="el-form-item__content" style={this.contentStyle()}>
212212
{this.props.children}
213-
<Transition name="md-fade-bottom">
214-
{
215-
error && <div className="el-form-item__error">{error}</div>
216-
}
213+
<Transition name="el-zoom-in-top">
214+
{ error && <div className="el-form-item__error">{error}</div> }
217215
</Transition>
218216
</div>
219217
</div>

0 commit comments

Comments
 (0)