Skip to content

Commit bb33413

Browse files
authored
Merge pull request #50 from OrigenStudio/fix/drawer-open-animation
fixed the drawer's opening animation
2 parents 1ab8bc0 + 30ce3ec commit bb33413

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "material-ui-layout",
3-
"version": "0.1.0-rc.1",
3+
"version": "0.1.0-rc.2",
44
"description": "Layout components for material-ui",
55
"main": "./lib/index.js",
66
"scripts": {

src/components/Layout/styles.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ const styles = theme => ({
3535
main: {
3636
paddingTop: '0px',
3737
display: 'flex',
38+
width: '100%',
3839
transition: theme.transitions.create(['margin', 'width'], {
3940
easing: theme.transitions.easing.sharp,
4041
duration: theme.transitions.duration.leavingScreen,
@@ -60,24 +61,26 @@ const styles = theme => ({
6061
},
6162
[theme.breakpoints.up('sm')]: {
6263
mainFixedAppBar: {
63-
marginTop: `${theme.mixins.toolbar[theme.breakpoints.up('sm')]
64-
.minHeight}px`,
64+
marginTop: `${
65+
theme.mixins.toolbar[theme.breakpoints.up('sm')].minHeight
66+
}px`,
6567
},
6668
mainFixedTwoRowAppBar: {
6769
marginTop: `${theme.mixins.toolbar[theme.breakpoints.up('sm')].minHeight *
6870
2}px`,
6971
},
7072
mainGrow: {
71-
height: `calc(100vh - ${theme.mixins.toolbar[theme.breakpoints.up('sm')]
72-
.minHeight}px)`,
73+
height: `calc(100vh - ${
74+
theme.mixins.toolbar[theme.breakpoints.up('sm')].minHeight
75+
}px)`,
7376
},
7477
mainGrowTwoRowAppBar: {
7578
height: `calc(100vh - ${theme.mixins.toolbar[theme.breakpoints.up('sm')]
7679
.minHeight * 2}px)`,
7780
},
7881
drawerHeaderTwoRowAppBar: {
79-
minHeight: `${theme.mixins.toolbar[theme.breakpoints.up('sm')]
80-
.minHeight * 2}px`,
82+
minHeight: `${theme.mixins.toolbar[theme.breakpoints.up('sm')].minHeight *
83+
2}px`,
8184
},
8285
},
8386
mainStickyFooter: {

0 commit comments

Comments
 (0)