oxaliq/node-go
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

style Continue as Guest button, patch account display on NavBar

Browse source
This commit is contained in:
sorrelbri 2020-06-27 13:05:38 -07:00
parent 0ec92dd5e9
commit 9cae5ff185
3 changed files with 39 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/play-node-go/public/reset.css
View file

@ -51,3 +51,8 @@ table {
border-collapse: collapse;
border-spacing: 0;
}
button {
background: none;
border: none;
}

12
packages/play-node-go/src/pages/Layout/MainWrapper/MainWrapper.scss
View file

@ -1,4 +1,5 @@
@import '../../../../public/stylesheets/partials/mixins';
@import '../../../../public/stylesheets/partials/variables';
div.main-wrapper {
display: flex;
@ -33,4 +34,15 @@ div.main-wrapper {
height: 100%;
}
}
}
button {
color:map-get($colors, 'sidebar_link');
cursor: pointer;
font-family: inherit;
font-size: 110%;
font-weight: bold;
margin-bottom: .5em;
padding: 0;
text-decoration: none;
}

37
packages/play-node-go/src/pages/Layout/NavBar/NavBar.js
View file

@ -1,29 +1,36 @@
import React from 'react';
import { Link } from 'react-router-dom';
import './NavBar.scss';
import Logo from '../../../components/Display/Logo/Logo';
const NavBar = (props) => {
import React from "react";
import { Link } from "react-router-dom";
import "./NavBar.scss";
import Logo from "../../../components/Display/Logo/Logo";
const NavBar = ({ state }) => {
return (
<div className="NavBar" data-testid="NavBar">
<Link to="/home" >
<div className="NavBar__logo"><Logo /></div>
<Link to="/home">
<div className="NavBar__logo">
<Logo />
</div>
</Link>
<Link to="/home" >
<div className="NavBar__menu-item NavBar__home"><p className="--link">Find a Game</p></div>
<Link to="/home">
<div className="NavBar__menu-item NavBar__home">
<p className="--link">Find a Game</p>
</div>
</Link>
<Link to="/news">
<div className="NavBar__menu-item NavBar__news"><p className="--link">News</p></div>
<div className="NavBar__menu-item NavBar__news">
<p className="--link">News</p>
</div>
</Link>
<Link to="/account">
<div className="NavBar__menu-item NavBar__account">{props.user ? props.user.username : <></>}</div>
<div className="NavBar__menu-item NavBar__account">
{state.user.username ? state.user.username : <></>}
</div>
</Link>
</div>
);
}
};
export default NavBar;
export default NavBar;