Commit ae2836ab authored by David Haynes's avatar David Haynes 🙆
Browse files

NavBar finished again again

- better use of space on desktop and mobile
parent 6ee83f33
Pipeline #3559 passed with stage
in 1 minute and 14 seconds
...@@ -32,11 +32,11 @@ class AuthButton extends React.Component { ...@@ -32,11 +32,11 @@ class AuthButton extends React.Component {
return ( return (
<div> <div>
{is_auth ? ( {is_auth ? (
<Button color="info" href="/auth/logout"> <Button outline color="accent" href="/auth/logout">
Logout <i className="fas fa-sign-out-alt" /> Logout <i className="fas fa-sign-out-alt" />
</Button> </Button>
) : ( ) : (
<Button color="info" href="/auth/login"> <Button outline color="accent" href="/auth/login">
Login <i className="fas fa-sign-in-alt" /> Login <i className="fas fa-sign-in-alt" />
</Button> </Button>
)} )}
......
...@@ -36,15 +36,14 @@ class NavBar extends React.Component { ...@@ -36,15 +36,14 @@ class NavBar extends React.Component {
<img <img
src="static/go.svg" src="static/go.svg"
className="d-inline-block align-top" className="d-inline-block align-top"
width="30" width="42"
height="30" height="42"
alt="SRCT Go" alt="SRCT Go"
/> />
Go
</NavbarBrand> </NavbarBrand>
<NavbarToggler onClick={this.toggleNavbar} className="mr-2" /> <NavbarToggler onClick={this.toggleNavbar} className="ml-auto" />
<Collapse isOpen={!this.state.collapsed} navbar> <Collapse isOpen={!this.state.collapsed} navbar>
<Nav className="ml-auto" navbar> <Nav className="mx-auto" navbar>
<NavItem> <NavItem>
<NavLink href="#/dhaynes" active={pathname == "/dhaynes"}> <NavLink href="#/dhaynes" active={pathname == "/dhaynes"}>
Dhaynes Dhaynes
...@@ -60,8 +59,8 @@ class NavBar extends React.Component { ...@@ -60,8 +59,8 @@ class NavBar extends React.Component {
Debug Debug
</NavLink> </NavLink>
</NavItem> </NavItem>
<AuthButton />
</Nav> </Nav>
<AuthButton className="ml-auto" />
</Collapse> </Collapse>
</Container> </Container>
</Navbar> </Navbar>
......
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