Skip to content

Commit 4b489ec

Browse files
authored
Merge pull request #1 from anthony-zhou/assorted-updates-zhou
Update contact form, footer, intro section, and links
2 parents a8d5a34 + 688c96e commit 4b489ec

File tree

20 files changed

+232
-48
lines changed

20 files changed

+232
-48
lines changed

src/assets/illustrations/footer.svg

Lines changed: 3 additions & 1 deletion
Loading

src/assets/images/meetup-logo.svg

Lines changed: 82 additions & 0 deletions
Loading

src/assets/images/slack-logo.png

17.1 KB
Loading

src/components/common/Input/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import styled from 'styled-components';
33
export const Input = styled.input`
44
width: 100%;
55
box-sizing: border-box;
6-
border: 2px solid #6c63ff;
6+
// border: 2px solid #6c63ff;
7+
border: 2px solid #0074d9;
78
padding: 0.8rem 1rem;
89
border-radius: 7px;
910
margin-bottom: 0.5rem;
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import styled from 'styled-components';
2+
3+
export const SectionHeading = styled.h1`
4+
font-size: 4em;
5+
text-align: center;
6+
`;

src/components/common/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ export * from './Container';
33
export * from './Button';
44
export * from './Card';
55
export * from './Input';
6-
export * from './SEO';
6+
export * from './SEO';
7+
export * from './SectionHeading';

src/components/landing/About/index.jsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ export const About = () => (
1010
<Details>
1111
<h1>Who We Are</h1>
1212
<p>
13-
Our mission is to harness the digital era to make government work for the people, by the people! Our focus is on making the biggest impact on the needs of our community and advocating for open government and open data.
13+
Our mission is to harness the digital era to make government work for the people, by the people! We are here to serve the needs of our community and advocate for open government and open data.
1414
</p>
15-
{/* <Button as={AnchorLink} href="#contact">
16-
Hire me
17-
</Button> */}
1815
</Details>
1916
</SkillsWrapper>
2017
</Wrapper>
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import React from 'react';
2+
import AnchorLink from 'react-anchor-link-smooth-scroll';
3+
import { Container, Card, SectionHeading } from 'components/common';
4+
import { Wrapper, Grid, Item, Content } from './styles';
5+
import jg from 'assets/images/jgonzales_from_unsplash.jpg';
6+
7+
export function Events() {
8+
return (
9+
<Wrapper as={Container} id="events">
10+
<SectionHeading>Events</SectionHeading>
11+
12+
</Wrapper>
13+
)
14+
}
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import styled from 'styled-components';
2+
3+
export const Wrapper = styled.div`
4+
padding: 2rem 0;
5+
`;
6+
7+
export const Grid = styled.div`
8+
display: grid;
9+
align-items: center;
10+
grid-template-columns: repeat(3, 1fr);
11+
grid-template-rows: 8fr;
12+
gap: 1.2rem 1.2rem;
13+
14+
@media (max-width: 960px) {
15+
grid-template-columns: repeat(2, 1fr);
16+
}
17+
18+
@media (max-width: 680px) {
19+
grid-template-columns: 1fr;
20+
}
21+
`;
22+
23+
export const Item = styled.div`
24+
width: 100%;
25+
height: 100%;
26+
overflow: hidden;
27+
box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.11);
28+
29+
h4 {
30+
color: #212121;
31+
}
32+
33+
p {
34+
color: #707070;
35+
}
36+
`;
37+
38+
export const Content = styled.div`
39+
padding: 1rem 0;
40+
`;
41+
42+
export const Stats = styled.div`
43+
display: flex;
44+
align-items: center;
45+
46+
div {
47+
display: flex;
48+
&:first-child {
49+
margin-right: 0.5rem;
50+
}
51+
52+
img {
53+
margin: 0;
54+
}
55+
56+
span {
57+
color: #000;
58+
margin-left: 0.5rem;
59+
}
60+
}
61+
`;

src/components/landing/Intro/index.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ export const Intro = () => (
1111
<Header />
1212
<IntroWrapper as={Container}>
1313
<Details>
14-
<h1>We are Code for Dallas</h1>
15-
<h4>A volunteer-led civic technology organization that brings together developers, designers, data enthusiasts and city staff.</h4>
14+
<h1>At the intersection of technology and government.</h1>
15+
<h4>We're a nonprofit with the mission to unite developers, designers, and city staff for the good of all.</h4>
16+
{/* <h4>We're volunteer-led civic technology organization that brings together developers, designers, data enthusiasts and city staff.</h4> */}
1617
<Button as={AnchorLink} href="#about">
1718
Learn more
1819
</Button>

0 commit comments

Comments
 (0)