Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ticket #82: Moved searchbar to middle of header #90

Merged
merged 2 commits into from
May 9, 2019
Merged

Ticket #82: Moved searchbar to middle of header #90

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e257d4c
Got search bar in middle
NicholasMiron May 9, 2019
a251c88
Merge branch 'development' of https://github.com/hratx-blue-ocean/hra…
NicholasMiron May 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 14 additions & 8 deletions client/src/Components/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ const styles = theme => ({
},
},
},
header: {
display: 'flex',
justifyContent: 'space-between'
}
});

function SearchAppBar(props) {
Expand All @@ -84,12 +88,12 @@ function SearchAppBar(props) {
return (
<div className={classes.root} style={{position: 'fixed', top: 0}}>
<AppBar position="static" style={{background: '#C4ADAE'}}>
<Toolbar>
<Toolbar className={classes.header}>
<a href='_' className={classes.title} onClick={goHome}>
<img alt='' src="brand_assets/logo_only_transparent.png" style={{width: "50px", height: "50px"}}/>
<img alt='' src="brand_assets/text_only_transparent.png" style={{height: "20px", paddingLeft: "8px", paddingRight: "8px"}}/>
</a>
<div className={classes.grow} />
{/* <div className={classes.grow} /> */}
<div className={classes.search}>
<div className={classes.searchIcon}>
{/* <SearchIcon /> */}
Expand All @@ -102,12 +106,14 @@ function SearchAppBar(props) {
}}
/>
</div>
<Button onClick={(event) => {props.toggleModal(event,"login")}} className={classes.button}>
Login
</Button>
<Button onClick={(event) => {props.toggleModal(event,"signup")}} className={classes.button}>
Signup
</Button>
<div>
<Button onClick={(event) => {props.toggleModal(event,"login")}} className={classes.button}>
Login
</Button>
<Button onClick={(event) => {props.toggleModal(event,"signup")}} className={classes.button}>
Signup
</Button>
</div>
</Toolbar>
</AppBar>
</div>
Expand Down