Commit 88c2caee authored by Andrew Hrdy's avatar Andrew Hrdy
Browse files

Worked more on temp navbar.

parent cf29c7cc
...@@ -11,6 +11,7 @@ import {compose} from 'redux'; ...@@ -11,6 +11,7 @@ import {compose} from 'redux';
import Drawer from 'material-ui/Drawer'; import Drawer from 'material-ui/Drawer';
import List, {ListItem} from 'material-ui/List'; import List, {ListItem} from 'material-ui/List';
import Divider from 'material-ui/Divider'; import Divider from 'material-ui/Divider';
import classNames from 'classnames'
class CustomAppBar extends React.Component { class CustomAppBar extends React.Component {
...@@ -31,19 +32,20 @@ class CustomAppBar extends React.Component { ...@@ -31,19 +32,20 @@ class CustomAppBar extends React.Component {
render() { render() {
return (<div> return (<div>
<AppBar position="absolute"> <AppBar position="absolute" className={this.props.classes.appBar}>
<Toolbar> <Toolbar>
<Typography type="title" color="inherit" className={this.props.classes.title}> <img src={require('../images/SRCT_square.svg')} className={this.props.classes.navbarLogo} />
<Typography type="title" className={classNames(this.props.classes.title, this.props.classes.navbarTextColor)}>
What's Open What's Open
</Typography> </Typography>
<Button color="contrast" className={this.props.classes.appBarLinkButton}> <Button className={classNames(this.props.classes.appBarLinkButton, this.props.classes.navbarTextColor)}>
About About
</Button> </Button>
<Button color="contrast" className={this.props.classes.appBarLinkButton}> <Button className={classNames(this.props.classes.appBarLinkButton, this.props.classes.navbarTextColor)}>
Feedback Feedback
</Button> </Button>
<IconButton onClick={this.toggleDrawer} color="contrast" aria-label="Menu" <IconButton onClick={this.toggleDrawer} aria-label="Menu"
className={this.props.classes.appBarMenuButton}> className={classNames(this.props.classes.appBarMenuButton, this.props.classes.navbarTextColor)}>
<MenuIcon/> <MenuIcon/>
</IconButton> </IconButton>
</Toolbar> </Toolbar>
...@@ -55,7 +57,7 @@ class CustomAppBar extends React.Component { ...@@ -55,7 +57,7 @@ class CustomAppBar extends React.Component {
What's Open What's Open
</Typography> </Typography>
</ListItem> </ListItem>
<Divider /> <Divider/>
<ListItem> <ListItem>
<Button className={this.props.classes.drawerLinkButton}> <Button className={this.props.classes.drawerLinkButton}>
About About
...@@ -85,6 +87,10 @@ const styleSheet = { ...@@ -85,6 +87,10 @@ const styleSheet = {
display: 'inherit !important' display: 'inherit !important'
} }
}, },
appBar: {
backgroundColor: 'white',
boxShadow: '0px 1px 0px 0px rgba(0, 0, 0, 0.2)'
},
appBarDrawerList: { appBarDrawerList: {
width: '250px' width: '250px'
}, },
...@@ -96,6 +102,14 @@ const styleSheet = { ...@@ -96,6 +102,14 @@ const styleSheet = {
}, },
appBarMenuButton: { appBarMenuButton: {
display: 'none' display: 'none'
},
navbarLogo: {
width: '30px',
height: '30px',
marginRight: '5px'
},
navbarTextColor: {
color: '#354052'
} }
}; };
......
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="167.512px" height="166.341px" viewBox="0 0 167.512 166.341" enable-background="new 0 0 167.512 166.341"
xml:space="preserve">
<g>
<defs>
<filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="3.003" y="19.473" width="145.191" height="128.147">
<feColorMatrix type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/>
<feFlood style="flood-color:white;flood-opacity:1" result="back"/>
<feBlend in="source" in2="back" mode="normal"/>
</filter>
</defs>
<mask maskUnits="userSpaceOnUse" x="3.003" y="19.473" width="145.191" height="128.147" id="SVGID_1_">
<g filter="url(#Adobe_OpacityMaskFilter)">
<g>
<text transform="matrix(0.8849 0 0 1 55.0654 160.4102)" fill="#FFFFFF" font-family="'Xolonium-Bold'" font-size="8.7214">srct.gmu.edu</text>
</g>
</g>
</mask>
<g mask="url(#SVGID_1_)">
<path fill="#232A38" stroke="#232A38" stroke-width="2" stroke-miterlimit="10" d="M21.142,69.849h37.987
c2.034,0,4.069,0,4.069-3.143V55.484c0-3.141-2.035-3.141-4.069-3.141H37.422c-8.14,0-16.28,0-16.28-12.12v-7.631
c0-12.119,8.14-12.119,16.28-12.119h37.005v9.875H36.743c-2.034,0-4.069,0-4.069,3.142v5.835c0,3.142,2.035,3.142,4.069,3.142
h21.709c8.14,0,16.279,0,16.279,12.121v13.016c0,12.121-8.14,12.121-16.279,12.121h-37.31V69.849z"/>
<path fill="#232A38" stroke="#232A38" stroke-width="2" stroke-miterlimit="10" d="M130.987,79.726l-19.441-24.243H98.585v24.243
h-12.24V20.473h39.604c8.641,0,17.281,0,17.281,12.119v10.773c0,12.118-8.641,12.118-16.563,12.118l19.443,24.243H130.987z
M126.667,45.607c2.16,0,4.32,0,4.32-3.141V33.49c0-3.142-2.16-3.142-4.32-3.142H98.585v15.26H126.667z"/>
<path fill="#232A38" stroke="#232A38" stroke-width="2" stroke-miterlimit="10" d="M21.142,100.168
c0-11.943,8.642-11.943,17.283-11.943h36.002v9.732H37.704c-2.16,0-4.321,0-4.321,3.098v32.734c0,3.096,2.161,3.096,4.321,3.096
h36.723v9.734H38.425c-8.641,0-17.283,0-17.283-11.943V100.168z"/>
<path fill="#232A38" stroke="#232A38" stroke-width="2" stroke-miterlimit="10" d="M86.345,88.225h60.763v9.732h-24.304v48.662
H110.65V97.958H86.345V88.225z"/>
<ellipse fill="#232A38" cx="8.936" cy="96.088" rx="5.933" ry="6.148"/>
</g>
<path fill="none" stroke="#242A38" stroke-width="11.808" stroke-miterlimit="10" d="M8.936,96.106v49.324
c0,6.75,5.16,12.393,11.232,12.393h-0.063h127.531l0,0c5.89,0,11.232-5.432,11.232-12.393V21.504
c0-6.752-5.16-12.495-11.232-12.495l0,0H20.892c-5.889,0-11.957,5.533-11.957,12.495v40.413c0,6.753,6.134,12.906,12.207,12.906"/>
</g>
</svg>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment