Skip to content

Commit

Permalink
navigation icons
Browse files Browse the repository at this point in the history
  • Loading branch information
@mpolinowski
mpolinowski committed Nov 3, 2017
1 parent 3e6a573 commit 52415a5
Show file tree
Hide file tree
Showing 8 changed files with 77 additions and 25 deletions.
53 changes: 53 additions & 0 deletions src/components/MediaCards.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,59 @@ function MediaCards(props) {
</CardActions>
</Card>
</Grid>

<Grid item xs={12} sm={6} lg={4}>
<Card className={classes.card}>
<CardMedia
className={classes.media}
image={Paella}
title="Good Eats"
/>
<CardContent>
<Typography type="headline" component="h2">
Paella
</Typography>
<Typography component="p">
Many non-Spaniards view paella as Spain's national dish, but most Spaniards consider it to be a regional Valencian dish.
</Typography>
</CardContent>
<CardActions>
<Button dense color="primary">
Share
</Button>
<Button dense color="primary">
Learn More
</Button>
</CardActions>
</Card>
</Grid>

<Grid item xs={12} sm={6} lg={4}>
<Card className={classes.card}>
<CardMedia
className={classes.media}
image={Reptile}
title="Contemplative Reptile"
/>
<CardContent>
<Typography type="headline" component="h2">
Lizard
</Typography>
<Typography component="p">
Lizards are a widespread group of squamate reptiles, with over 6,000 species, ranging
across all continents except Antarctica
</Typography>
</CardContent>
<CardActions>
<Button dense color="primary">
Share
</Button>
<Button dense color="primary">
Learn More
</Button>
</CardActions>
</Card>
</Grid>
</Grid>
</div>
);
Expand Down
8 changes: 6 additions & 2 deletions src/components/ResponsiveDrawer.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -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: {
Expand Down Expand Up @@ -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,
}}
Expand Down
3 changes: 0 additions & 3 deletions src/layouts/index.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import './index.css'
const styles = theme => ({
root: {
width: '100%',
zIndex: 1,
overflow: 'hidden',
},
appFrame: {
display: 'flex',
Expand All @@ -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,
Expand Down
22 changes: 10 additions & 12 deletions src/navigation/_drawerP.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -45,7 +43,7 @@ class DrawerIA extends React.Component {

<ListItem button>
<ListItemIcon>
<SendIcon />
<SettingsIcon />
</ListItemIcon>
<ListItemText inset primary="Lenses" />
</ListItem>
Expand All @@ -55,49 +53,49 @@ class DrawerIA extends React.Component {

<ListItem button>
<ListItemIcon>
<SendIcon />
<SettingsIcon />
</ListItemIcon>
<ListItemText inset primary="IN-LAN" />
</ListItem>
<ListItem button>
<ListItemIcon>
<SendIcon />
<SettingsIcon />
</ListItemIcon>
<ListItemText inset primary="IN-PoE" />
</ListItem>
<ListItem button>
<ListItemIcon>
<SendIcon />
<SettingsIcon />
</ListItemIcon>
<ListItemText inset primary="IN-Route" />
</ListItem>
<ListItem button>
<ListItemIcon>
<SendIcon />
<SettingsIcon />
</ListItemIcon>
<ListItemText inset primary="IN-Motion" />
</ListItem>
<ListItem button>
<ListItemIcon>
<SendIcon />
<SettingsIcon />
</ListItemIcon>
<ListItemText inset primary="IN-Frared" />
</ListItem>
<ListItem button>
<ListItemIcon>
<SendIcon />
<SettingsIcon />
</ListItemIcon>
<ListItemText inset primary="IN-Mikro" />
</ListItem>
<ListItem button>
<ListItemIcon>
<SendIcon />
<SettingsIcon />
</ListItemIcon>
<ListItemText inset primary="Downloads" />
</ListItem>
<ListItem button>
<ListItemIcon>
<SendIcon />
<SettingsIcon />
</ListItemIcon>
<ListItemText inset primary="Usermanuals" />
</ListItem>
Expand Down
4 changes: 2 additions & 2 deletions src/navigation/_drawerPIndoorCameras.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -28,7 +28,7 @@ class DrawerPIndoorCameras extends React.Component {
<div>
<ListItem button onClick={this.handleClick}>
<ListItemIcon>
<SendIcon />
<SettingsIcon />
</ListItemIcon>
<ListItemText inset primary="WebUI and Firmware Update" />
{this.state.open ? <ExpandLess /> : <ExpandMore />}
Expand Down
4 changes: 2 additions & 2 deletions src/navigation/_drawerPOutdoorCameras.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -28,7 +28,7 @@ class DrawerPOutdoorCameras extends React.Component {
<div>
<ListItem button onClick={this.handleClick}>
<ListItemIcon>
<SendIcon />
<SettingsIcon />
</ListItemIcon>
<ListItemText inset primary="WebUI and Firmware Update" />
{this.state.open ? <ExpandLess /> : <ExpandMore />}
Expand Down
4 changes: 2 additions & 2 deletions src/navigation/_drawerPSoftware.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -28,7 +28,7 @@ class DrawerPSoftware extends React.Component {
<div>
<ListItem button onClick={this.handleClick}>
<ListItemIcon>
<SendIcon />
<SettingsIcon />
</ListItemIcon>
<ListItemText inset primary="WebUI and Firmware Update" />
{this.state.open ? <ExpandLess /> : <ExpandMore />}
Expand Down
4 changes: 2 additions & 2 deletions src/navigation/_drawerPWebUserInterface.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -28,7 +28,7 @@ class DrawerPWebUserInterface extends React.Component {
<div>
<ListItem button onClick={this.handleClick}>
<ListItemIcon>
<SendIcon />
<SettingsIcon />
</ListItemIcon>
<ListItemText inset primary="WebUI and Firmware Update" />
{this.state.open ? <ExpandLess /> : <ExpandMore />}
Expand Down

0 comments on commit 52415a5

Please sign in to comment.