diff --git a/docs/src/modules/components/AppDrawer.js b/docs/src/modules/components/AppDrawer.js index cecd244a523f44..716faf1ef2bbf8 100644 --- a/docs/src/modules/components/AppDrawer.js +++ b/docs/src/modules/components/AppDrawer.js @@ -3,7 +3,6 @@ import classNames from 'classnames'; import PropTypes from 'prop-types'; import { withStyles } from 'material-ui/styles'; import List from 'material-ui/List'; -import Toolbar from 'material-ui/Toolbar'; import Drawer from 'material-ui/Drawer'; import Typography from 'material-ui/Typography'; import Divider from 'material-ui/Divider'; @@ -29,6 +28,9 @@ const styles = theme => ({ display: 'flex', }, toolbar: { + ...theme.mixins.toolbar, + paddingLeft: theme.spacing.unit * 3, + display: 'flex', flexGrow: 1, flexDirection: 'column', alignItems: 'flex-start', @@ -88,7 +90,7 @@ function AppDrawer(props, context) { const drawer = (
- +
Material-UI @@ -102,9 +104,9 @@ function AppDrawer(props, context) { {`v${process.env.MATERIAL_UI_VERSION}`} ) : null} - - +
+ {renderNavItems({ props, pages: context.pages, activePage: context.activePage, depth: 0 })}
); diff --git a/docs/src/modules/components/AppDrawerNavItem.js b/docs/src/modules/components/AppDrawerNavItem.js index b4e57bda3834bd..d85adf2d81514b 100644 --- a/docs/src/modules/components/AppDrawerNavItem.js +++ b/docs/src/modules/components/AppDrawerNavItem.js @@ -1,40 +1,32 @@ import React from 'react'; import PropTypes from 'prop-types'; import Link from 'docs/src/modules/components/Link'; -import classNames from 'classnames'; import { withStyles } from 'material-ui/styles'; import { ListItem } from 'material-ui/List'; import Button from 'material-ui/Button'; import Collapse from 'material-ui/transitions/Collapse'; const styles = theme => ({ - button: theme.mixins.gutters({ - borderRadius: 0, - justifyContent: 'flex-start', - textTransform: 'none', - width: '100%', - transition: theme.transitions.create('background-color', { - duration: theme.transitions.duration.shortest, - }), - '&:hover': { - textDecoration: 'none', - }, - }), item: { - ...theme.typography.body2, display: 'block', paddingTop: 0, paddingBottom: 0, }, - leaf: { - fontWeight: theme.typography.fontWeightRegular, + itemLeaf: { display: 'flex', paddingTop: 0, paddingBottom: 0, }, - leafButton: { + button: { + justifyContent: 'flex-start', + textTransform: 'none', + width: '100%', + }, + buttonLeaf: { + justifyContent: 'flex-start', + textTransform: 'none', + width: '100%', color: theme.palette.text.secondary, - fontSize: theme.typography.pxToRem(13), }, active: { color: theme.palette.text.primary, @@ -74,12 +66,12 @@ class AppDrawerNavItem extends React.Component { if (href) { return ( - +