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

Adding active style to side nav links #281

Merged
merged 10 commits into from
Sep 27, 2018
Merged

Adding active style to side nav links #281

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fc2edc7
Adding active style to side nav links
jonrohan Sep 25, 2018
12ec3c2
Updating headings to turn bold
jonrohan Sep 25, 2018
37236f2
The fontSize is reversed
jonrohan Sep 25, 2018
59bff9c
Using typography props on Link component
jonrohan Sep 25, 2018
df26115
Not bold, just gray
jonrohan Sep 25, 2018
af747cc
Prettier format
jonrohan Sep 25, 2018
5e7133e
Adding bold to docs sandbox links
jonrohan Sep 26, 2018
c28c951
Merge branch 'q3-wildflower' into side_nav_active_style
jonrohan Sep 26, 2018
3a6d6e7
Update Header.js
jonrohan Sep 26, 2018
9aa313a
Prettier
jonrohan Sep 26, 2018
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
22 changes: 18 additions & 4 deletions pages/doc-components/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import React from 'react'
import {withRouter} from 'next/router'
import Octicon, {MarkGithub} from '@githubprimer/octicons-react'
import NextLink from 'next/link'
import BoxShadow from './BoxShadow'
import {Text, FlexContainer, Link, Sticky} from '../../src'

const Header = () => (
const Header = ({router}) => (
<Sticky zIndex={100}>
<BoxShadow py={3} bg="gray.9" color="white">
<FlexContainer className="p-responsive" alignItems="center" justifyContent="space-between">
Expand All @@ -18,12 +19,25 @@ const Header = () => (
</NextLink>
<div>
<NextLink href="/components">
<Link nounderline className="text-white" href="/components" px={4}>
<Link
nounderline
className="text-white"
href="/components"
px={4}
fontWeigt={router.pathname === '/components' ? 'bold' : null}
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like we're missing the "h" in fontWeight here.

Copy link
Member Author

Choose a reason for hiding this comment

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

ahhhhh

>
Docs
</Link>
</NextLink>
<NextLink href="/components/sandbox">
<Link nounderline className="text-white" href="/components/sandbox" mr={0} px={4}>
<Link
nounderline
className="text-white"
href="/components/sandbox"
mr={0}
px={4}
fontWeigt={router.pathname === '/components/sandbox' ? 'bold' : null}
>
Sandbox
</Link>
</NextLink>
Expand All @@ -33,4 +47,4 @@ const Header = () => (
</Sticky>
)

export default Header
export default withRouter(Header)