Skip to content

Commit

Permalink
fix(emotion): updated the navigation components to use emotion
Browse files Browse the repository at this point in the history
which removes the need to depend on glamor

for #571
  • Loading branch information
travi committed Oct 27, 2019
1 parent 0d47a17 commit a209e2c
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 14 deletions.
32 changes: 24 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
"dependencies": {
"@emotion/core": "^10.0.21",
"gatsby-link": "^2.2.20",
"glamor": "2.20.40",
"glamorous": "5.0.0",
"prop-types": "15.7.2",
"react-simple-icons": "^1.0.0-beta.5",
Expand Down
7 changes: 3 additions & 4 deletions src/atoms/navigation/site/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';
import {shape} from 'prop-types';
import {css} from 'glamor';
import Link from 'gatsby-link';
import layoutStyles from '../../../layoutStyles.json';

Expand All @@ -16,9 +15,9 @@ export default function SiteNavigation({linkStyles}) {

return (
<ol css={{listStyle: 'none', display: 'flex', margin: 0, paddingLeft: layoutStyles.innerGutterWidth}}>
<li className={css(listItemStyles)}><Link className={css(enhancedLinkStyles)} to="/">Home</Link></li>
<li className={css(listItemStyles)}>
<Link className={css(enhancedLinkStyles)} to="/archive">Past Meetings</Link>
<li css={listItemStyles}><Link css={enhancedLinkStyles} to="/">Home</Link></li>
<li css={listItemStyles}>
<Link css={enhancedLinkStyles} to="/archive">Past Meetings</Link>
</li>
</ol>
);
Expand Down
2 changes: 1 addition & 1 deletion src/molecules/navigation-bar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const navigationTextColor = '#fff';

export default function NavigationBar() {
return (
<div style={{background: '#666', display: 'flex', justifyContent: 'space-between', alignItems: 'center'}}>
<div css={{background: '#666', display: 'flex', justifyContent: 'space-between', alignItems: 'center'}}>
<SiteNavigation linkStyles={{color: navigationTextColor}} />
<FooterSocialIcons color={navigationTextColor} />
</div>
Expand Down

0 comments on commit a209e2c

Please sign in to comment.