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

issue-434 #449

Merged
merged 4 commits into from
Apr 5, 2019
Merged

issue-434 #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c06d68b
updating file paths to source from component library
Apr 3, 2019
a4135e9
removing comments
Apr 3, 2019
27478e4
updating file paths and adding Logo as component
Apr 4, 2019
4c5a6d7
adding additional Logo components
Apr 4, 2019
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
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@
"pretty": "prettier --write \"./**/*.{js,jsx,css,md}\""
},
"husky": {
"hooks": {
}
"hooks": {}
},
"lint-staged": {
"*.{js,jsx}": [
Expand Down
18 changes: 8 additions & 10 deletions packages/2018/src/assets/LandingPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,14 @@ import { Link } from 'react-router';
import CanvasParticles from './CanvasParticles';
import DataList from './DataList';
import SearchBar from './SearchBar';
import { Header, Footer } from '@hackoregon/component-library';
import { Header, Footer, Logo } from '@hackoregon/component-library';

import logo from '../../assets/civic-logo-animated.svg';
import smallLogo from '../../assets/civic-logo-c.svg';
import brain from '../../assets/brain.svg';
import brainMobile from '../../assets/brain-mobile.svg';
import trees from '../../assets/trees.png';
import hackOregonLogo from '../../assets/hack-oregon-logo.png';
import heartMail from '../../assets/heartmail.png';
import twitterLogo from '../../assets/twitter-logo.png';
import brain from '@hackoregon/component-library/assets/brain.svg'
import brainMobile from '@hackoregon/component-library/assets/brain-mobile.svg'
import trees from '@hackoregon/component-library/assets/trees.png'
import hackOregonLogo from '@hackoregon/component-library/assets/hack-oregon-logo.png'
import heartMail from '@hackoregon/component-library/assets/heartmail.png'
import twitterLogo from '@hackoregon/component-library/assets/twitter-logo.png'

import cities from './cities';
import zipCodes from './zipCodes.json';
Expand Down Expand Up @@ -470,7 +468,7 @@ class LandingPage extends React.Component {
<div className={aboutCivicWrapper} id="aboutCivic">
<div className={sectionHeaderWrapper}>
<div className={smallLogoWrapper}>
<img src={smallLogo} />
<Logo type="squareLogo"/>
</div>
<div className={sectionRightContainer}>
<div className={sectionHeaderTitle}>
Expand Down
12 changes: 0 additions & 12 deletions packages/2018/src/assets/civic-logo-animated.svg
View file
Open in desktop

This file was deleted.

18 changes: 8 additions & 10 deletions packages/2018/src/components/LandingPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,14 @@ import { Link } from 'react-router';
import CanvasParticles from './CanvasParticles';
import DataList from './DataList';
import SearchBar from './SearchBar';
import { Header, Footer } from '@hackoregon/component-library';
import { Header, Footer, Logo } from '@hackoregon/component-library';

import logo from '../../assets/civic-logo-animated.svg';
import smallLogo from '../../assets/civic-logo-c.svg';
import brain from '../../assets/brain.svg';
import brainMobile from '../../assets/brain-mobile.svg';
import trees from '../../assets/trees.png';
import hackOregonLogo from '../../assets/hack-oregon-logo.png';
import heartMail from '../../assets/heartmail.png';
import twitterLogo from '../../assets/twitter-logo.png';
import brain from '@hackoregon/component-library/assets/brain.svg'
import brainMobile from '@hackoregoncomponent-library/assets/brain-mobile.svg'
import trees from '@hackoregon/component-library/assets/trees.png'
import hackOregonLogo from '@hackoregon/component-library/assets/hack-oregon-logo.png'
import heartMail from '@hackoregon/component-library/assets/heartmail.png'
import twitterLogo from '@hackoregon/component-library/assets/twitter-logo.png'

import cities from './cities';
import zipCodes from './zipCodes.json';
Expand Down Expand Up @@ -470,7 +468,7 @@ class LandingPage extends React.Component {
<div className={aboutCivicWrapper} id="aboutCivic">
<div className={sectionHeaderWrapper}>
<div className={smallLogoWrapper}>
<img src={smallLogo} />
<Logo type="squareLogo"/>
</div>
<div className={sectionRightContainer}>
<div className={sectionHeaderTitle}>
Expand Down
3 changes: 2 additions & 1 deletion packages/2018/src/components/PortlandCollectionPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react';
import { css } from 'emotion';
import { Link } from 'react-router';
import { Logo } from '@hackoregon/component-library'

const collectionPageWrapper = css`
position: relative;
Expand Down Expand Up @@ -135,7 +136,7 @@ const PortlandCollectionPage = () => (
<div className={leftContainer}>
<div className={homeLink}>
<Link to="/">
<img src={require(`../assets/civic-logo-animated.svg`)} />
<Logo />
</Link>
</div>
<h1>Portland Collections</h1>
Expand Down