Skip to content

Commit

Permalink
Merge pull request #120 from emirhankudevi/master
Browse files Browse the repository at this point in the history
BInput inputStyle fixed.
  • Loading branch information
canpolatoral authored May 2, 2019
2 parents 39dec85 + 51769cf commit 154ff05
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions packages/components/src/Input/Input.js
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ class Input extends EditorBase {
paddingTop: 10,
marginTop: 0,
};
const rootStyle = Object.assign(baseRootStyle, this.props.inputStyle);
const rootStyle = Object.assign(baseRootStyle, this.props.style);
let visibleLabel = true;

if (!focussed) {
Expand Down Expand Up @@ -767,7 +767,7 @@ class Input extends EditorBase {
inputRef={this.props.inputRef}
fullWidth={fullWidth}
type={type}
style={this.props.inputStyle}
// style={this.props.inputStyle}
value={this.state.value}
disabled={this.state.disabled}
disableUnderline={!underlineShow}
Expand Down

0 comments on commit 154ff05

Please sign in to comment.