Skip to content

Commit 701264e

Browse files
oliviertassinarimarcelpanse
authored andcommitted
[InputAdornment] Fix flexbox alignment bug for IE (mui#12975)
* InputAdornment: Fix flexbox alignment bug for IE * let's merge
1 parent a5d9ba8 commit 701264e

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

docs/src/pages/demos/text-fields/FilledInputAdornments.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const styles = theme => ({
1818
margin: theme.spacing.unit,
1919
},
2020
textField: {
21-
flexBasis: 280,
21+
flexBasis: 200,
2222
},
2323
});
2424

docs/src/pages/demos/text-fields/OutlinedInputAdornments.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const styles = theme => ({
1818
margin: theme.spacing.unit,
1919
},
2020
textField: {
21-
flexBasis: 280,
21+
flexBasis: 200,
2222
},
2323
});
2424

packages/material-ui/src/InputAdornment/InputAdornment.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export const styles = {
88
/* Styles applied to the root element. */
99
root: {
1010
display: 'flex',
11+
height: '0.01em', // Fix IE 11 flexbox alignment. To remove at some point.
1112
maxHeight: '2em',
1213
alignItems: 'center',
1314
},

packages/material-ui/src/InputBase/InputBase.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export const styles = theme => {
7575
display: 'block',
7676
// Make the flex item shrink with Firefox
7777
minWidth: 0,
78-
flexGrow: 1,
78+
width: '100%', // Fix IE11 width issue
7979
'&::-webkit-input-placeholder': placeholder,
8080
'&::-moz-placeholder': placeholder, // Firefox 19+
8181
'&:-ms-input-placeholder': placeholder, // IE 11

0 commit comments

Comments
 (0)