From 52415a5d50920c81f08b2057b899a3708812d10c Mon Sep 17 00:00:00 2001 From: Mike Polinowski Date: Fri, 3 Nov 2017 18:21:43 +0800 Subject: [PATCH] navigation icons --- src/components/MediaCards.jsx | 53 +++++++++++++++++++++ src/components/ResponsiveDrawer.jsx | 8 +++- src/layouts/index.jsx | 3 -- src/navigation/_drawerP.jsx | 22 ++++----- src/navigation/_drawerPIndoorCameras.jsx | 4 +- src/navigation/_drawerPOutdoorCameras.jsx | 4 +- src/navigation/_drawerPSoftware.jsx | 4 +- src/navigation/_drawerPWebUserInterface.jsx | 4 +- 8 files changed, 77 insertions(+), 25 deletions(-) diff --git a/src/components/MediaCards.jsx b/src/components/MediaCards.jsx index 32956ba..d5ab554 100644 --- a/src/components/MediaCards.jsx +++ b/src/components/MediaCards.jsx @@ -107,6 +107,59 @@ function MediaCards(props) { + + + + + + + Paella + + + Many non-Spaniards view paella as Spain's national dish, but most Spaniards consider it to be a regional Valencian dish. + + + + + + + + + + + + + + + Lizard + + + Lizards are a widespread group of squamate reptiles, with over 6,000 species, ranging + across all continents except Antarctica + + + + + + + + ); diff --git a/src/components/ResponsiveDrawer.jsx b/src/components/ResponsiveDrawer.jsx index 79fea8b..9846a7e 100644 --- a/src/components/ResponsiveDrawer.jsx +++ b/src/components/ResponsiveDrawer.jsx @@ -20,7 +20,7 @@ import ListSubheader from 'material-ui/List/ListSubheader' import Logo from '../static/instar_250x65.png' import DrawerMain from '../navigation/DrawerMain' -const drawerWidth = 270; +const drawerWidth = 250; const styles = theme => ({ root: { @@ -45,13 +45,16 @@ const styles = theme => ({ display: 'none', }, }, + drawer: { + bottom: 0, + }, drawerHeader: theme.mixins.toolbar, drawerPaper: { width: 250, [theme.breakpoints.up('md')]: { width: drawerWidth, position: 'relative', - bottom: 0, + height: '100%', } }, input: { @@ -105,6 +108,7 @@ class ResponsiveDrawer extends React.Component { type="temporary" anchor={theme.direction === 'rtl' ? 'right' : 'left'} open={this.state.mobileOpen} + className={classes.drawer} classes={{ paper: classes.drawerPaper, }} diff --git a/src/layouts/index.jsx b/src/layouts/index.jsx index 9b84c86..e938534 100644 --- a/src/layouts/index.jsx +++ b/src/layouts/index.jsx @@ -12,8 +12,6 @@ import './index.css' const styles = theme => ({ root: { width: '100%', - zIndex: 1, - overflow: 'hidden', }, appFrame: { display: 'flex', @@ -22,7 +20,6 @@ const styles = theme => ({ content: { backgroundColor: theme.palette.background.default, width: '100%', - height: '100%', padding: theme.spacing.unit * 3, height: 'calc(100% - 56px)', marginTop: 56, diff --git a/src/navigation/_drawerP.jsx b/src/navigation/_drawerP.jsx index 42a23f0..6254c02 100644 --- a/src/navigation/_drawerP.jsx +++ b/src/navigation/_drawerP.jsx @@ -4,9 +4,7 @@ import { withStyles } from 'material-ui/styles' import ListSubheader from 'material-ui/List/ListSubheader' import List, { ListItem, ListItemIcon, ListItemText } from 'material-ui/List' import Collapse from 'material-ui/transitions/Collapse' -import InboxIcon from 'material-ui-icons/MoveToInbox' -import DraftsIcon from 'material-ui-icons/Drafts' -import SendIcon from 'material-ui-icons/Send' +import SettingsIcon from 'material-ui-icons/Settings' import ExpandLess from 'material-ui-icons/ExpandLess' import ExpandMore from 'material-ui-icons/ExpandMore' import Divider from 'material-ui/Divider' @@ -45,7 +43,7 @@ class DrawerIA extends React.Component { - + @@ -55,49 +53,49 @@ class DrawerIA extends React.Component { - + - + - + - + - + - + - + - + diff --git a/src/navigation/_drawerPIndoorCameras.jsx b/src/navigation/_drawerPIndoorCameras.jsx index fd4cde9..b188ad9 100644 --- a/src/navigation/_drawerPIndoorCameras.jsx +++ b/src/navigation/_drawerPIndoorCameras.jsx @@ -4,7 +4,7 @@ import { withStyles } from 'material-ui/styles' import ListSubheader from 'material-ui/List/ListSubheader' import List, { ListItem, ListItemIcon, ListItemText } from 'material-ui/List' import Collapse from 'material-ui/transitions/Collapse' -import SendIcon from 'material-ui-icons/Send' +import SettingsIcon from 'material-ui-icons/Settings' import ExpandLess from 'material-ui-icons/ExpandLess' import ExpandMore from 'material-ui-icons/ExpandMore' import NavigateNext from 'material-ui-icons/NavigateNext' @@ -28,7 +28,7 @@ class DrawerPIndoorCameras extends React.Component {
- + {this.state.open ? : } diff --git a/src/navigation/_drawerPOutdoorCameras.jsx b/src/navigation/_drawerPOutdoorCameras.jsx index 93e4856..e1116ec 100644 --- a/src/navigation/_drawerPOutdoorCameras.jsx +++ b/src/navigation/_drawerPOutdoorCameras.jsx @@ -4,7 +4,7 @@ import { withStyles } from 'material-ui/styles' import ListSubheader from 'material-ui/List/ListSubheader' import List, { ListItem, ListItemIcon, ListItemText } from 'material-ui/List' import Collapse from 'material-ui/transitions/Collapse' -import SendIcon from 'material-ui-icons/Send' +import SettingsIcon from 'material-ui-icons/Settings' import ExpandLess from 'material-ui-icons/ExpandLess' import ExpandMore from 'material-ui-icons/ExpandMore' import NavigateNext from 'material-ui-icons/NavigateNext' @@ -28,7 +28,7 @@ class DrawerPOutdoorCameras extends React.Component {
- + {this.state.open ? : } diff --git a/src/navigation/_drawerPSoftware.jsx b/src/navigation/_drawerPSoftware.jsx index 50a6114..a94b8e8 100644 --- a/src/navigation/_drawerPSoftware.jsx +++ b/src/navigation/_drawerPSoftware.jsx @@ -4,7 +4,7 @@ import { withStyles } from 'material-ui/styles' import ListSubheader from 'material-ui/List/ListSubheader' import List, { ListItem, ListItemIcon, ListItemText } from 'material-ui/List' import Collapse from 'material-ui/transitions/Collapse' -import SendIcon from 'material-ui-icons/Send' +import SettingsIcon from 'material-ui-icons/Settings' import ExpandLess from 'material-ui-icons/ExpandLess' import ExpandMore from 'material-ui-icons/ExpandMore' import NavigateNext from 'material-ui-icons/NavigateNext' @@ -28,7 +28,7 @@ class DrawerPSoftware extends React.Component {
- + {this.state.open ? : } diff --git a/src/navigation/_drawerPWebUserInterface.jsx b/src/navigation/_drawerPWebUserInterface.jsx index 7d568d8..c820499 100644 --- a/src/navigation/_drawerPWebUserInterface.jsx +++ b/src/navigation/_drawerPWebUserInterface.jsx @@ -4,7 +4,7 @@ import { withStyles } from 'material-ui/styles' import ListSubheader from 'material-ui/List/ListSubheader' import List, { ListItem, ListItemIcon, ListItemText } from 'material-ui/List' import Collapse from 'material-ui/transitions/Collapse' -import SendIcon from 'material-ui-icons/Send' +import SettingsIcon from 'material-ui-icons/Settings' import ExpandLess from 'material-ui-icons/ExpandLess' import ExpandMore from 'material-ui-icons/ExpandMore' import NavigateNext from 'material-ui-icons/NavigateNext' @@ -28,7 +28,7 @@ class DrawerPWebUserInterface extends React.Component {
- + {this.state.open ? : }