Skip to content

Commit

Permalink
- differences from MUI 3 to MUI 4
Browse files Browse the repository at this point in the history
  • Loading branch information
Manu committed Jun 13, 2019
1 parent 6ec78a4 commit 05727f4
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ const customTabsStyle = {
maxHeight: "unset !important",
"& > svg": {
verticalAlign: "middle",
margin: "-1px 5px 0 0"
margin: "-1.55px 5px 0 0 !important"
},
"&,& *": {
letterSpacing: "normal !important"
}
}
};
Expand Down
18 changes: 16 additions & 2 deletions src/assets/jss/material-kit-react/components/navPillsStyle.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const navPillsStyle = theme => ({
display: "none !important"
},
fixed: {
overflowX: "visible"
overflow: "visible !important"
},
horizontalDisplay: {
display: "block"
Expand All @@ -58,7 +58,10 @@ const navPillsStyle = theme => ({
width: "30px",
height: "30px",
display: "block",
margin: "15px 0"
margin: "15px 0 !important",
"&, & *": {
letterSpacing: "normal !important"
}
},
horizontalPills: {
width: "100%",
Expand Down Expand Up @@ -121,6 +124,17 @@ const navPillsStyle = theme => ({
alignCenter: {
alignItems: "center",
justifyContent: "center"
},
tabWrapper: {
color: "inherit",
position: "relative",
fontSize: "12px",
lineHeight: "24px",
fontWeight: "500",
textTransform: "uppercase",
"&,& *": {
letterSpacing: "normal"
}
}
});

Expand Down
3 changes: 2 additions & 1 deletion src/components/NavPills/NavPills.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ class NavPills extends React.Component {
{...icon}
classes={{
root: pillsClasses,
selected: classes[color]
selected: classes[color],
wrapper: classes.tabWrapper
}}
/>
);
Expand Down

0 comments on commit 05727f4

Please sign in to comment.