Skip to content

[InputAdornment] Fix flexbox alignment bug for IE #12975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 23, 2018
Merged

[InputAdornment] Fix flexbox alignment bug for IE #12975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdf1bbb
InputAdornment: Fix flexbox alignment bug for IE
TimeDropsSB Sep 19, 2018
27649a1
let's merge
oliviertassinari Sep 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/src/pages/demos/text-fields/FilledInputAdornments.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const styles = theme => ({
margin: theme.spacing.unit,
},
textField: {
flexBasis: 280,
flexBasis: 200,
},
});

Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/demos/text-fields/OutlinedInputAdornments.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const styles = theme => ({
margin: theme.spacing.unit,
},
textField: {
flexBasis: 280,
flexBasis: 200,
},
});

Expand Down
1 change: 1 addition & 0 deletions packages/material-ui/src/InputAdornment/InputAdornment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export const styles = {
/* Styles applied to the root element. */
root: {
display: 'flex',
height: '0.01em', // Fix IE 11 flexbox alignment. To remove at some point.
maxHeight: '2em',
alignItems: 'center',
},
Expand Down
2 changes: 1 addition & 1 deletion packages/material-ui/src/InputBase/InputBase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export const styles = theme => {
display: 'block',
// Make the flex item shrink with Firefox
minWidth: 0,
flexGrow: 1,
width: '100%', // Fix IE11 width issue
'&::-webkit-input-placeholder': placeholder,
'&::-moz-placeholder': placeholder, // Firefox 19+
'&:-ms-input-placeholder': placeholder, // IE 11
Expand Down