Skip to content

Commit 264c64d

Browse files
[core] Fix conflict
1 parent e7cae4a commit 264c64d

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

docs/src/pages/demos/tabs/CustomizedTabs.tsx

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import React from 'react';
2-
import { makeStyles, withStyles } from '@material-ui/styles';
2+
import { makeStyles, withStyles, Theme, createStyles } from '@material-ui/core/styles';
33
import Tabs from '@material-ui/core/Tabs';
44
import Tab from '@material-ui/core/Tab';
55
import Typography from '@material-ui/core/Typography';
6-
import { Theme } from '@material-ui/core/styles';
76

87
interface StyledTabsProps {
98
value: number;
@@ -27,15 +26,17 @@ interface StyledTabProps {
2726
label: string;
2827
}
2928

30-
const StyledTab = withStyles((theme: Theme) => ({
31-
root: {
32-
textTransform: 'initial',
33-
color: '#fff',
34-
fontWeight: theme.typography.fontWeightRegular,
35-
fontSize: theme.typography.pxToRem(15),
36-
marginRight: theme.spacing(1),
37-
},
38-
}))((props: StyledTabProps) => <Tab disableRipple {...props} />);
29+
const StyledTab = withStyles((theme: Theme) =>
30+
createStyles({
31+
root: {
32+
textTransform: 'initial',
33+
color: '#fff',
34+
fontWeight: theme.typography.fontWeightRegular,
35+
fontSize: theme.typography.pxToRem(15),
36+
marginRight: theme.spacing(1),
37+
},
38+
}),
39+
)((props: StyledTabProps) => <Tab disableRipple {...props} />);
3940

4041
const useStyles = makeStyles((theme: Theme) => ({
4142
root: {

0 commit comments

Comments
 (0)