Skip to content

feat: add top-level nav styles #883

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

Merged
merged 3 commits into from
Apr 6, 2022
Merged

feat: add top-level nav styles #883

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74f26e7
feat: add projects link to the top nav
code-asher Apr 4, 2022
eee1702
Merge remote-tracking branch 'origin/main' into asher/top-nav
code-asher Apr 6, 2022
5ba5339
Rename projects navbar item to templates
code-asher Apr 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 63 additions & 21 deletions site/src/components/Navbar/NavbarView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import Button from "@material-ui/core/Button"
import { makeStyles } from "@material-ui/core/styles"
import List from "@material-ui/core/List"
import ListItem from "@material-ui/core/ListItem"
import { fade, makeStyles } from "@material-ui/core/styles"
import React from "react"
import { Link } from "react-router-dom"
import { NavLink } from "react-router-dom"
import { UserResponse } from "../../api/types"
import { Logo } from "../Icons"
import { UserDropdown } from "./UserDropdown"
Expand All @@ -14,29 +15,34 @@ export interface NavbarViewProps {
export const NavbarView: React.FC<NavbarViewProps> = ({ user, onSignOut }) => {
const styles = useStyles()
return (
<div className={styles.root}>
<div className={styles.fixed}>
<Link to="/">
<Button className={styles.logo} variant="text">
<Logo fill="white" opacity={1} />
</Button>
</Link>
</div>
<nav className={styles.root}>
<List className={styles.fixed}>
<ListItem className={styles.item}>
<NavLink className={styles.logo} to="/">
<Logo fill="white" opacity={1} width={125} />
</NavLink>
</ListItem>
<ListItem button className={styles.item}>
<NavLink className={styles.link} to="/templates">
Templates
</NavLink>
</ListItem>
</List>
<div className={styles.fullWidth} />
<div className={styles.fixed}>{user && <UserDropdown user={user} onSignOut={onSignOut} />}</div>
</div>
</nav>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

praise: for fixing the semantics of this HTML

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yay!

)
}

const useStyles = makeStyles((theme) => ({
root: {
position: "relative",
display: "flex",
flex: "0",
flex: 0,
flexDirection: "row",
justifyContent: "center",
alignItems: "center",
height: "56px",
height: 56,
background: theme.palette.navbar.main,
marginTop: 0,
transition: "margin 150ms ease",
Expand All @@ -46,24 +52,60 @@ const useStyles = makeStyles((theme) => ({
borderBottom: `1px solid #383838`,
},
fixed: {
flex: "0",
flex: 0,
display: "flex",
padding: 0,
},
fullWidth: {
flex: "1",
flex: 1,
},
logo: {
flex: "0",
height: "56px",
alignItems: "center",
display: "flex",
height: 56,
paddingLeft: theme.spacing(4),
paddingRight: theme.spacing(2),
borderRadius: 0,
"& svg": {
display: "block",
width: 125,
},
},
title: {
flex: "1",
flex: 1,
textAlign: "center",
},
item: {
padding: 0,
},
link: {
alignItems: "center",
color: "#A7A7A7",
display: "flex",
fontSize: 16,
height: 56,
padding: `0 ${theme.spacing(3)}px`,
textDecoration: "none",
transition: "background-color 0.3s ease",

"&:hover": {
backgroundColor: fade(theme.palette.primary.light, 0.1),
},

// NavLink adds this class when the current route matches.
"&.active": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

chef's kiss

position: "relative",
color: theme.palette.primary.contrastText,

"&::before": {
content: `"{"`,
left: 10,
position: "absolute",
},

"&::after": {
content: `"}"`,
position: "absolute",
right: 10,
},
},
},
}))