Skip to content

Commit

Permalink
[core] Apply 3 different fixes (#5695)
Browse files Browse the repository at this point in the history
- Prevent using style conflicting properties like border and border Button
facebook/react#6348
- Avoid using ES6 features that can't be transpiled like includes
- Remove dead style properties
  • Loading branch information
oliviertassinari committed Dec 1, 2016
1 parent 2f87f9d commit 825ea44
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 0 additions & 2 deletions src/Stepper/StepLabel.js
Expand Up @@ -29,8 +29,6 @@ const getStyles = ({active, completed, disabled}, {muiTheme, stepper}) => {
height: 24,
},
iconContainer: {
display: 'flex',
alignItems: 'center',
paddingRight: 8,
},
};
Expand Down
4 changes: 3 additions & 1 deletion src/TextField/TextFieldUnderline.js
Expand Up @@ -75,7 +75,9 @@ const TextFieldUnderline = (props) => {

const styles = {
root: {
border: 'none',
borderTop: 'none',
borderLeft: 'none',
borderRight: 'none',
borderBottom: 'solid 1px',
borderColor: borderColor,
bottom: 8,
Expand Down
2 changes: 1 addition & 1 deletion src/utils/autoprefixer.js
Expand Up @@ -26,7 +26,7 @@ export default function(muiTheme) {
let isFlex = false;

if (isServer) {
isFlex = ['flex', 'inline-flex'].includes(style.display);
isFlex = ['flex', 'inline-flex'].indexOf(style.display) !== -1;
}

const stylePrefixed = InlineStylePrefixer.prefixAll(style);
Expand Down

0 comments on commit 825ea44

Please sign in to comment.