Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions packages/material-ui/src/styles/createMixins.d.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Breakpoints } from './createBreakpoints';
import { Spacing } from './createSpacing';
import * as React from 'react';
import { CSSProperties } from './withStyles';

export interface Mixins {
gutters: (styles?: React.CSSProperties) => React.CSSProperties;
toolbar: React.CSSProperties;
gutters: (styles?: CSSProperties) => CSSProperties;
toolbar: CSSProperties;
// ... use interface declaration merging to add custom mixins
}

Expand Down
29 changes: 29 additions & 0 deletions packages/material-ui/src/styles/createMixins.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { createMuiTheme, makeStyles } from '@material-ui/core/styles';

{
const theme = createMuiTheme({
mixins: {
toolbar: {
background: '#fff',
minHeight: 36,
'@media (min-width:0px) and (orientation: landscape)': {
minHeight: 24
},
'@media (min-width:600px)': {
minHeight: 48
}
},
}
});

const useStyles = makeStyles(theme => ({
appBarSpacer: theme.mixins.toolbar,
toolbarIcon: {
display: 'flex',
alignItems: 'center',
justifyContent: 'flex-end',
padding: '0 8px',
...theme.mixins.toolbar,
},
}));
}